summaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-04-09 11:53:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-04-09 11:53:06 -0700
commit0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (patch)
tree83855363f7be25305477dca09a91166deb376354 /drivers/net/bonding
parentf16393776fc133d95fe3b3ba7118df579ed90af5 (diff)
parent5091b353883ba3358998797efb284f82344531f3 (diff)
downloadblackbird-op-linux-0eddb519b9127c73d53db4bf3ec1d45b13f844d1.tar.gz
blackbird-op-linux-0eddb519b9127c73d53db4bf3ec1d45b13f844d1.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/mlx4: Check correct variable for allocation failure RDMA/nes: Correct cap.max_inline_data assignment in nes_query_qp() RDMA/cm: Set num_paths when manually assigning path records IB/cm: Fix device_create() return value check
Diffstat (limited to 'drivers/net/bonding')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud