From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 29 Sep 2008 15:05:55 +0000 (-0700)
Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi... 
X-Git-Tag: v2.6.27-rc8~10
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3c1370a3f6ba8e4813269ddbf950d59f997338bc;p=linux-2.6-omap-h63xx.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_nv: reinstate nv_hardreset() for non generic controllers
---

3c1370a3f6ba8e4813269ddbf950d59f997338bc