| commit | 7a62b17694e278b1cde659f85aa6149052baa811 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 16 09:48:53 2008 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 16 09:48:53 2008 -0800 |
| tree | 2863d84ab659472f87d300d0100b9a815200bf89 | |
| parent | 3bd82263a0d770d2ab3efd37144993f4433a179c [diff] | |
| parent | 3ee89f177e3cef0b5b024bcb6df683a3fa7d795f [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: pata_hpt366: no ATAPI DMA pata_hpt366: fix cable detection, libata: fix Seagate NCQ+FLUSH blacklist