diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-12 18:52:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-12 18:52:31 -0800 |
| commit | b1ef951e8199d1c59f14dbe0fa22974ed57a3b48 (patch) | |
| tree | 86a16643358339c23e3d7a9e608fcc90a18d2c84 /drivers/video/imxfb.h | |
| parent | 775ba7ad491a154f99871fe603f03366e84ae159 (diff) | |
| parent | 82b399133b6ebf667ee635fc69ef26b61eede4bc (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:
IPoIB: Make sure struct ipoib_neigh.queue is always initialized
IB/iser: Use the new verbs DMA mapping functions
IB/srp: Use new verbs IB DMA mapping functions
IPoIB: Use the new verbs DMA mapping functions
IB/core: Use the new verbs DMA mapping functions
IB/ipath: Implement new verbs DMA mapping functions
IB: Add DMA mapping functions to allow device drivers to interpose
RDMA/cma: Export rdma cm interface to userspace
RDMA/cma: Add support for RDMA_PS_UDP
RDMA/cma: Allow early transition to RTS to handle lost CM messages
RDMA/cma: Report connect info with connect events
RDMA/cma: Remove unneeded qp_type parameter from rdma_cm
IB/ipath: Fix IRQ for PCI Express HCAs
RDMA/amso1100: Fix memory leak in c2_qp_modify()
IB/iser: Remove unused "write-only" variables
IB/ipath: Remove unused "write-only" variables
IB/fmr: ib_flush_fmr_pool() may wait too long
Diffstat (limited to 'drivers/video/imxfb.h')
0 files changed, 0 insertions, 0 deletions