tree 8f291886f3f04a5daf9c3727938f20a1db1c06b2
parent 51eb9ab91abc9c384118b1d947e4b99cc2bc5fc5
parent 8c9ea7fe96afb30660673da77853114827fac0ca
author Linus Torvalds <torvalds@linux-foundation.org> 1231863582 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1231863582 -0800

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