tree 8e2286479c18f5ee076d26ee44ff03b44d38a299
parent 1f0e14bbc065c88ddb68fec42b317f487cc85410
parent 5040ab67a2c6d5710ba497dc52a8f7035729d7b0
author Linus Torvalds <torvalds@linux-foundation.org> 1263358580 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1263358580 -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:
  libata: retry link resume if necessary
  ata_piix: enable 32bit PIO on SATA piix
  sata_promise: don't classify overruns as HSM errors