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)
* '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


Trivial merge