summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2008-07-26 22:59:47 +0200
committerRoland Dreier <rolandd@cisco.com>2008-07-26 22:59:47 +0200
commitcc9969c96765476db5e30c9e074a57838604c1d1 (patch)
tree919c8528ca998f037afb8a512ba0f9c81e70069c /drivers/infiniband
parentRDMA/ucm: BKL is not needed for ib_ucm_open() (diff)
parentIPoIB: Correct help text for INFINIBAND_IPOIB_DEBUG (diff)
parentmlx4: Update/add Mellanox Technologies copyright lines to mlx4 driver files (diff)
parentRDMA/nes: CM connection setup/teardown rework (diff)
downloadlinux-cc9969c96765476db5e30c9e074a57838604c1d1.tar.xz
linux-cc9969c96765476db5e30c9e074a57838604c1d1.zip
Merge branches 'bkl-removal', 'ipoib', 'mlx4' and 'nes' into for-linus