From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 30 Mar 2006 22:32:38 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: v3.12-rc1~36966
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=064c94f9da8845f12446ab37142aa10f3c6f66ac;p=kernel%2Fkernel-generic.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/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
---

064c94f9da8845f12446ab37142aa10f3c6f66ac