diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 11:36:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-23 11:36:01 -0700 |
| commit | 32708e8e95265505d9627b3bc9ed16566e0dca1c (patch) | |
| tree | c5161d2a3da5d75123c05eda5713469d02f743b1 /drivers/ata/pata_optidma.c | |
| parent | f5bcf5f44796bf30a058a01c10a61b19784f0540 (diff) | |
| parent | 4a7eca824cec51168dcd5e0c9bf9edbc809fb975 (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:
RDMA: Add __init/__exit macros to addr.c and cma.c
IB/ehca: Bump version number
mlx4_core: Fix dma_sync_single_for_cpu() with matching for_device() calls
IB/mthca: Replace dma_sync_single() use with proper functions
RDMA/nes: Fix FIN state handling under error conditions
RDMA/nes: Fix max_qp_init_rd_atom returned from query device
IB/ehca: Ensure that guid_entry index is not negative
IB/ehca: Tolerate dynamic memory operations before driver load
Diffstat (limited to 'drivers/ata/pata_optidma.c')
0 files changed, 0 insertions, 0 deletions