Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Dec 2010 21:00:16 +0000 (13:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Dec 2010 21:00:16 +0000 (13:00 -0800)
commitdfe80f63293ece364795c2e87805882c9ec3a266
tree4325d2abfdae85c88ad6445b5bb48b2993470f59
parenta4790c9457ae973d598bbd5ce58f9eaa2dd1576b
parente5005b15c91f3362036067bde5210d5c78af2f0d
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:
  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()