diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-02 14:36:05 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-02 14:36:05 -0800 |
| commit | 40eb006685387b2861bd7196be0ab7144c5d5b71 (patch) | |
| tree | c43ba94aa8632127ce9433dce0832e4e2734a2b4 /drivers/input/joydev.c | |
| parent | e957b00a8caece90cbc2afd0a4cb4c4d61b9efa8 (diff) | |
| parent | 7a118df3ea23820b9922a1b51cd2f24e464f4c17 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband:
RDMA/addr: Use client registration to fix module unload race
IB/mthca: Fix MAD extended header format for MAD_IFC firmware command
IB/uverbs: Return sq_draining value in query_qp response
IB/amso1100: Fix incorrect pr_debug()
IB/amso1100: Use dma_alloc_coherent() instead of kmalloc/dma_map_single
IB/ehca: Fix eHCA driver compilation for uniprocessor
RDMA/cma: rdma_bind_addr() leaks a cma_dev reference count
IB/iser: Start connection after enabling iSER
Diffstat (limited to 'drivers/input/joydev.c')
0 files changed, 0 insertions, 0 deletions