diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-06 11:33:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-06 11:33:30 -0700 |
| commit | 06a1578e2448112d6f635b1a458a65e36f0f97c6 (patch) | |
| tree | de48f52efe3af42efa602274db1b501749ec260e /include/linux/proc_fs.h | |
| parent | 256a13dd708004082a2de0938fd614b155c259e2 (diff) | |
| parent | 27676a3e166b352928a8ef7b1c0e322f3c471a3e (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/ipath: Fix SM trap forwarding
IB/ehca: Reject send WRs only for RESET, INIT and RTR state
MAINTAINERS: Update NetEffect (iw_nes) entry
IB/ipath: Fix device capability flags
IB/ipath: Avoid test_bit() on u64 SDMA status value
Diffstat (limited to 'include/linux/proc_fs.h')
0 files changed, 0 insertions, 0 deletions