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: MMI-PSA29.97-13-9~31913
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3c1370a3f6ba8e4813269ddbf950d59f997338bc;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.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:
  sata_nv: reinstate nv_hardreset() for non generic controllers
---

3c1370a3f6ba8e4813269ddbf950d59f997338bc