Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Dec 2008 17:48:53 +0000 (09:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 16 Dec 2008 17:48:53 +0000 (09:48 -0800)
commit7a62b17694e278b1cde659f85aa6149052baa811
tree2863d84ab659472f87d300d0100b9a815200bf89
parent3bd82263a0d770d2ab3efd37144993f4433a179c
parent3ee89f177e3cef0b5b024bcb6df683a3fa7d795f
Merge branch 'upstream-linus' of git://git./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