tree 4641055622b331edd392e31ba32bf05bf9848a3c
parent 4843a3baf20059a7ac5b55582672705d9e61e274
parent 0d9e6659a1bde3733cfd0072adbb3514b579e383
author Linus Torvalds <torvalds@linux-foundation.org> 1245778776 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1245778776 -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:
  libata: don't set IORDY for reset
  sata_fsl: Add power mgmt support
  [libata] PATA driver for CF interface on AT91SAM9260 SoC
  [libata] beautify module parameters