diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 10:50:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-08 10:50:34 -0700 |
| commit | 8e1bf9ffb1aca693e3cf4a4f7144c8f70c8a08b0 (patch) | |
| tree | 909d84df0515f4729257f228fceb5767f1a995d2 /drivers/media/Makefile | |
| parent | 148c69b4b0ec267b08d3619651ae4a10a1768b04 (diff) | |
| parent | 12137c593d127c6c1a3eb050674da047682badaf (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/ehca: Wait for async events to finish before destroying QP
IB/ipath: Fix SDMA error recovery in absence of link status change
IB/ipath: Need to always request and handle PIO avail interrupts
IB/ipath: Fix count of packets received by kernel
IB/ipath: Return the correct opcode for RDMA WRITE with immediate
IB/ipath: Fix bug that can leave sends disabled after freeze recovery
IB/ipath: Only increment SSN if WQE is put on send queue
IB/ipath: Only warn about prototype chip during init
RDMA/cxgb3: Fix severe limit on userspace memory registration size
RDMA/cxgb3: Don't add PBL memory to gen_pool in chunks
Diffstat (limited to 'drivers/media/Makefile')
0 files changed, 0 insertions, 0 deletions