diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 15:05:55 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 15:05:55 (GMT) |
| commit | 3c1370a3f6ba8e4813269ddbf950d59f997338bc (patch) | |
| tree | c4a78e3b79a1bf3e097d0f738f3012d21e9fa5c2 /drivers/scsi | |
| parent | 661b0680f736e628a6da1cc030c201646587d658 (diff) | |
| parent | 4c1eb90a0908c0c60db2169dce08fb672e7582f1 (diff) | |
| download | linux-fsl-qoriq-3c1370a3f6ba8e4813269ddbf950d59f997338bc.tar.xz | |
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
Diffstat (limited to 'drivers/scsi')
0 files changed, 0 insertions, 0 deletions