commit | 064c94f9da8845f12446ab37142aa10f3c6f66ac | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@g5.osdl.org> | Thu Mar 30 14:32:38 2006 -0800 |
committer | Linus Torvalds <torvalds@g5.osdl.org> | Thu Mar 30 14:32:38 2006 -0800 |
tree | 974a69a06e7f9218ad987e41fc6627d62eac091e | |
parent | 256414dee44eaa0983f5ab1a71877de23c4e9ce7 [diff] | |
parent | 618a3c03fcfdf1ac4543247c8ddfb0c9d775ff33 [diff] |
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/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