commit b4eea67a129423fe423c5d8d26a0aaa9d68ed600
author Linus Torvalds <torvalds@linux-foundation.org> Fri Jun 20 12:31:03 2008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Fri Jun 20 12:31:03 2008 -0700
tree 7c0fdf21fe2864d88762d54c91b77212614caf0c
parent 1f6ef2342972dc7fd623f360f84006e2304eb935
parent 9a3b103c27a7e3199b917bc3ca219530132afdfc

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:
  ahci: sis can't do PMP
  ata_piix: add TECRA M4 to broken suspend list
  LIBATA: Add HAVE_PATA_PLATFORM to select PATA_PLATFORM driver
  sata_mv: warn on PIO with multiple DRQs
  sata_mv: enable async_notify for 60x1 Rev.C0 and higher
  libata: don't check whether to use DMA or not for no data commands
  ahci: jmb361 has only one port