]> 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>
Sat, 17 Jan 2009 22:28:53 +0000 (14:28 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Jan 2009 22:28:53 +0000 (14:28 -0800)
commitf3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b
treebd43db7f86cd23af0c3905ff8ff991f910eba5e0
parent0bac038a9eec00ac27f95ca0360954c0016fd859
parentac8581d408d41ebd5583b4e85b18e7ef16bb044b
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