Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Sep 2008 15:05:55 +0000 (08:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Sep 2008 15:05:55 +0000 (08:05 -0700)
commit3c1370a3f6ba8e4813269ddbf950d59f997338bc
treec4a78e3b79a1bf3e097d0f738f3012d21e9fa5c2
parent661b0680f736e628a6da1cc030c201646587d658
parent4c1eb90a0908c0c60db2169dce08fb672e7582f1
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