summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2009-01-13 04:37:31 +0100
committerRoland Dreier <rolandd@cisco.com>2009-01-13 04:37:31 +0100
commit8c9ea7fe96afb30660673da77853114827fac0ca (patch)
tree76a49376d1dc88cc82b19bfb954f3ddfdaaaf14e /drivers
parentIB/ehca: spin_lock_irqsave() takes an unsigned long (diff)
parentIPoIB: Do not join broadcast group if interface is brought down (diff)
parentIB/iser: Add dependency on INFINIBAND_ADDR_TRANS (diff)
parentIB/mlx4: Don't register IB device for adapters with no IB ports (diff)
parentRDMA/nes: Fix for NIPQUAD removal (diff)
downloadlinux-8c9ea7fe96afb30660673da77853114827fac0ca.tar.xz
linux-8c9ea7fe96afb30660673da77853114827fac0ca.zip
Merge branches 'ehca', 'ipoib', 'iser', 'mlx4' and 'nes' into for-next