diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-30 14:32:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-30 14:32:38 -0800 |
| commit | 064c94f9da8845f12446ab37142aa10f3c6f66ac (patch) | |
| tree | 974a69a06e7f9218ad987e41fc6627d62eac091e /include/asm-arm/arch-ixp4xx/prpmc1100.h | |
| parent | 256414dee44eaa0983f5ab1a71877de23c4e9ce7 (diff) | |
| parent | 618a3c03fcfdf1ac4543247c8ddfb0c9d775ff33 (diff) | |
| download | talos-op-linux-064c94f9da8845f12446ab37142aa10f3c6f66ac.tar.gz talos-op-linux-064c94f9da8845f12446ab37142aa10f3c6f66ac.zip | |
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
Diffstat (limited to 'include/asm-arm/arch-ixp4xx/prpmc1100.h')
0 files changed, 0 insertions, 0 deletions
