Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Jun 2009 17:39:36 +0000 (10:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 23 Jun 2009 17:39:36 +0000 (10:39 -0700)
commit811e42cfba334d27797989ac8b0bea4981cb9581
tree4641055622b331edd392e31ba32bf05bf9848a3c
parent4843a3baf20059a7ac5b55582672705d9e61e274
parent0d9e6659a1bde3733cfd0072adbb3514b579e383
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: 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