Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 30 Mar 2006 22:32:38 +0000 (14:32 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 30 Mar 2006 22:32:38 +0000 (14:32 -0800)
commit064c94f9da8845f12446ab37142aa10f3c6f66ac
tree974a69a06e7f9218ad987e41fc6627d62eac091e
parent256414dee44eaa0983f5ab1a71877de23c4e9ce7
parent618a3c03fcfdf1ac4543247c8ddfb0c9d775ff33
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/mad: RMPP support for additional classes
  IB/mad: include GID/class when matching receives
  IB/mthca: Fix section mismatch problems
  IPoIB: Fix oops with raw sockets
  IB/mthca: Fix check of size in SRQ creation
  IB/srp: Fix unmapping of fake scatterlist