| commit | d7757be133cc05620608af46acd178686681b7ef | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 24 17:06:01 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Sep 24 17:06:01 2009 -0700 |
| tree | 32f68fd9d1fc58337a74c75db3e29790df219f67 | |
| parent | 94e0fb086fc5663c38bbc0fe86d698be8314f82f [diff] | |
| parent | 216c7f92b9ca7766600a3a04b9dda445a9217832 [diff] |
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