Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Sep 2009 00:06:01 +0000 (17:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Sep 2009 00:06:01 +0000 (17:06 -0700)
commitd7757be133cc05620608af46acd178686681b7ef
tree32f68fd9d1fc58337a74c75db3e29790df219f67
parent94e0fb086fc5663c38bbc0fe86d698be8314f82f
parent216c7f92b9ca7766600a3a04b9dda445a9217832
Merge branch 'for-linus' of git://git./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
drivers/infiniband/hw/nes/nes_nic.c