From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 30 Nov 2009 21:43:30 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.32~57
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7d34f46426c4f24a6c3356d5a938798a865ec9c6;p=users%2Fdwmw2%2Flinux.git

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:
  sata_fsl: Split hard and soft reset
---

7d34f46426c4f24a6c3356d5a938798a865ec9c6