diff options
author | Roland Dreier <rolandd@cisco.com> | 2009-01-13 04:37:31 +0100 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2009-01-13 04:37:31 +0100 |
commit | 8c9ea7fe96afb30660673da77853114827fac0ca (patch) | |
tree | 76a49376d1dc88cc82b19bfb954f3ddfdaaaf14e /drivers | |
parent | IB/ehca: spin_lock_irqsave() takes an unsigned long (diff) | |
parent | IPoIB: Do not join broadcast group if interface is brought down (diff) | |
parent | IB/iser: Add dependency on INFINIBAND_ADDR_TRANS (diff) | |
parent | IB/mlx4: Don't register IB device for adapters with no IB ports (diff) | |
parent | RDMA/nes: Fix for NIPQUAD removal (diff) | |
download | linux-8c9ea7fe96afb30660673da77853114827fac0ca.tar.xz linux-8c9ea7fe96afb30660673da77853114827fac0ca.zip |
Merge branches 'ehca', 'ipoib', 'iser', 'mlx4' and 'nes' into for-next