diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-16 09:48:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-16 09:48:53 -0800 |
| commit | 7a62b17694e278b1cde659f85aa6149052baa811 (patch) | |
| tree | 2863d84ab659472f87d300d0100b9a815200bf89 /kernel/Makefile | |
| 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
Diffstat (limited to 'kernel/Makefile')
0 files changed, 0 insertions, 0 deletions