From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 17 Jan 2009 22:28:53 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b;p=deliverable%2Flinux.git

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:
  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
---

f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b