From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 Jun 2009 17:39:36 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: 2.1b_release~12125
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=811e42cfba334d27797989ac8b0bea4981cb9581;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

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
---

811e42cfba334d27797989ac8b0bea4981cb9581