tree 4325d2abfdae85c88ad6445b5bb48b2993470f59
parent a4790c9457ae973d598bbd5ce58f9eaa2dd1576b
parent e5005b15c91f3362036067bde5210d5c78af2f0d
author Linus Torvalds <torvalds@linux-foundation.org> 1293224416 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1293224416 -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: issue DIPM enable commands with LPM state updated
  libata: no special completion processing for EH commands
  pata_mpc52xx: driver needs BMDMA
  pata_cs5536: Add support for non-X86_32 platforms
  libata-sff: fix HSM_ST_ERR handling in __ata_sff_port_intr()