tree 5cf1113408afbe617a39a1ccaed7860bab6193d2
parent 05fa199d45c54a9bda7aa3ae6537253d6f097aa9
parent e3cf95dd6d352954b663d2934110d6e30af2406d
author Linus Torvalds <torvalds@linux-foundation.org> 1239918124 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1239918124 -0700

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