diff options
author | Roland Dreier <rolandd@cisco.com> | 2009-09-24 21:43:08 +0200 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2009-09-24 21:43:08 +0200 |
commit | 216c7f92b9ca7766600a3a04b9dda445a9217832 (patch) | |
tree | f315d9f3cc3d1824253de9a014ac19ce8fc6ac36 /drivers/infiniband/hw | |
parent | IPoIB: Don't turn on carrier for a non-active port (diff) | |
parent | IB/mad: Fix lock-lock-timer deadlock in RMPP code (diff) | |
parent | mlx4_core: Pass cache line size to device FW (diff) | |
parent | IB/mthca: Fix access to freed memory in catastrophic event handling (diff) | |
parent | RDMA/nes: Remove duplicate .ndo_set_mac_address field initialization (diff) | |
download | linux-216c7f92b9ca7766600a3a04b9dda445a9217832.tar.xz linux-216c7f92b9ca7766600a3a04b9dda445a9217832.zip |
Merge branches 'ipoib', 'mad', 'mlx4', 'mthca' and 'nes' into for-linus