commit f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b
author Linus Torvalds <torvalds@linux-foundation.org> Sat Jan 17 14:28:53 2009 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Sat Jan 17 14:28:53 2009 -0800
tree bd43db7f86cd23af0c3905ff8ff991f910eba5e0
parent 0bac038a9eec00ac27f95ca0360954c0016fd859
parent ac8581d408d41ebd5583b4e85b18e7ef16bb044b

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/ehca: Use consistent types for ehca_plpar_hcall9()
  IB/ehca: Fix printk format warnings from u64 type change
  IPoIB: Do not print error messages for multicast join retries
  IB/mlx4: Fix memory ordering problem when posting LSO sends
  mlx4_core: Fix min() warning
  IPoIB: Fix deadlock between ipoib_open() and child interface create
  IPoIB: Fix hang in napi_disable() if P_Key is never found