tree 5275ba0640014793b1b81d52312a581384c335d3
parent cc9b0b9bea9a0057840261204a6e01c7e19d444c
parent 335f2d1b24a350ca8099aea6db5b7adc73666d2f
author Linus Torvalds <torvalds@linux-foundation.org> 1255120822 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1255120822 -0700

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:
  RDMA/addr: Fix resolution of local IPv6 addresses
  RDMA/cxgb3: Handle NULL inetdev pointer in iwch_query_port()
  mlx4_core: Add 40GigE device ID
  RDMA/iwcm: Don't call provider reject func with irqs disabled
  IB: Fix typo in udev rule documentation