commit | 3c1370a3f6ba8e4813269ddbf950d59f997338bc | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 29 08:05:55 2008 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 29 08:05:55 2008 -0700 |
tree | c4a78e3b79a1bf3e097d0f738f3012d21e9fa5c2 | |
parent | 661b0680f736e628a6da1cc030c201646587d658 [diff] | |
parent | 4c1eb90a0908c0c60db2169dce08fb672e7582f1 [diff] |
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