diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 15:19:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 15:19:09 -0700 |
| commit | c65a3500b2947d344862da8cce626b7cc7ec5758 (patch) | |
| tree | 5ba65501a50ab4b7373cba665357797044750930 /drivers/infiniband | |
| parent | d973664992d814d93db161b28c0cc9a4c7e68f42 (diff) | |
| parent | f7e989301b6c232dec5489e94ee7741c85cb11ba (diff) | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[libata] linux/libata.h: reorganize ata_device struct members a bit
ahci: SB600 ahci can't do MSI, blacklist that capability
libata: More TSSTcorp pain, keep in sync with legacy IDE
pata_via: Fix 6410 misdetect
[libata] pata_atiixp: fix PIO timing data misprogramming
Diffstat (limited to 'drivers/infiniband')
0 files changed, 0 insertions, 0 deletions