diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-09 19:48:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-09 19:48:15 -0800 |
| commit | f3a2c3ee458bd614231e548c13acb0cf33a68631 (patch) | |
| tree | 9af88e8f7cf9c47f9624203e97cdac2248c646f2 /drivers/ide/pci | |
| parent | 656829e2d052b1da4a72aa2ac39ad733a78530ce (diff) | |
| parent | f5e10529a9a835a267f6aa7806e291d6df845e14 (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:
IB/mthca: Don't execute QUERY_QP firmware command for QP in RESET state
IB/ehca: Use proper GFP_ flags for get_zeroed_page()
IB/mthca: Fix PRM compliance problem in atomic-send completions
RDMA/ucma: Don't report events with invalid user context
RDMA/ucma: Fix struct ucma_event leak when backlog is full
RDMA/iwcm: iWARP connection timeouts shouldn't be reported as rejects
IB/iser: Return error code when PDUs may not be sent
IB/mthca: Fix off-by-one in FMR handling on memfree
Diffstat (limited to 'drivers/ide/pci')
0 files changed, 0 insertions, 0 deletions