From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Jun 2008 19:31:03 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.26-rc7~10
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b4eea67a129423fe423c5d8d26a0aaa9d68ed600;p=linux-2.6-omap-h63xx.git

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
---

b4eea67a129423fe423c5d8d26a0aaa9d68ed600