Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Apr 2009 21:42:04 +0000 (14:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 16 Apr 2009 21:42:04 +0000 (14:42 -0700)
commitc19f83669a02d4fa047d0d40f518e90f6f19c4c6
tree5cf1113408afbe617a39a1ccaed7860bab6193d2
parent05fa199d45c54a9bda7aa3ae6537253d6f097aa9
parente3cf95dd6d352954b663d2934110d6e30af2406d
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:
  ata: Report 16/32bit PIO as best we can
  libata: use ATA_ID_CFA_*
  pata_legacy: fix no device fail path
  pata_hpt37x: fix HPT370 DMA timeouts
  libata: handle SEMB signature better