diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-25 02:06:01 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-25 02:06:01 +0200 |
commit | d7757be133cc05620608af46acd178686681b7ef (patch) | |
tree | 32f68fd9d1fc58337a74c75db3e29790df219f67 /Documentation/laptops | |
parent | Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
parent | Merge branches 'ipoib', 'mad', 'mlx4', 'mthca' and 'nes' into for-linus (diff) | |
download | linux-d7757be133cc05620608af46acd178686681b7ef.tar.xz linux-d7757be133cc05620608af46acd178686681b7ef.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:
IPoIB: Don't turn on carrier for a non-active port
IB/mthca: Fix access to freed memory in catastrophic event handling
mlx4_core: Pass cache line size to device FW
RDMA/nes: Remove duplicate .ndo_set_mac_address field initialization
IB/mad: Fix lock-lock-timer deadlock in RMPP code
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions