diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 09:52:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-17 09:52:11 -0800 |
| commit | ac0b50dd10ac0d30f2732eec0587f3632c2be725 (patch) | |
| tree | 7f342be7e40638b00ab18c2eb1045fef6d072309 /drivers/ata | |
| parent | a12e60621b553e32711f9ad653aad3c92881c400 (diff) | |
| parent | 3d758a4a48682639d3996968499913ecb1552e06 (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: Fix lock flag variable location, bump version number
IB/ehca: Serialize HCA-related hCalls if necessary
IB/ehca: Return correct number of SGEs for SRQ
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions