Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Dec 2008 01:45:28 +0000 (17:45 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 31 Dec 2008 01:45:28 +0000 (17:45 -0800)
commit6094c85a935f7eadb4c607c6dc6d86c0a9f09a4b
tree64798f350779f041812cb0265993907f972b5efa
parent590cf28580c999c8ba70dc39b40bab09d69e2630
parentee48c3d7d3afab7b582051ee8f3f8979e6a87766
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/mlx4: Fix reading SL field out of cqe->sl_vid
  RDMA/addr: Fix build breakage when IPv6 is disabled