tree 2863d84ab659472f87d300d0100b9a815200bf89
parent 3bd82263a0d770d2ab3efd37144993f4433a179c
parent 3ee89f177e3cef0b5b024bcb6df683a3fa7d795f
author Linus Torvalds <torvalds@linux-foundation.org> 1229449733 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1229449733 -0800

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