]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Jan 2009 16:19:42 +0000 (08:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 13 Jan 2009 16:19:42 +0000 (08:19 -0800)
commitccbf04f24c55ead791dac5df8ddeb1a640fbaad8
tree8f291886f3f04a5daf9c3727938f20a1db1c06b2
parent51eb9ab91abc9c384118b1d947e4b99cc2bc5fc5
parent8c9ea7fe96afb30660673da77853114827fac0ca
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:
  IB/iser: Add dependency on INFINIBAND_ADDR_TRANS
  IPoIB: Do not join broadcast group if interface is brought down
  RDMA/nes: Fix for NIPQUAD removal
  IPoIB: Fix loss of connectivity after bonding failover on both sides
  IB/mlx4: Don't register IB device for adapters with no IB ports
  mlx4_core: Fix warning from min()
  IB/ehca: spin_lock_irqsave() takes an unsigned long
drivers/infiniband/hw/nes/nes_cm.c