| commit | 0637810f24bad641d3d3f80fd3f63f3baffd9536 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 17 14:16:02 2009 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Feb 17 14:16:02 2009 -0800 |
| tree | 13ff343e916e925deed298ca4abd1a73fd95c50b | |
| parent | 51f267739a81db5eb511b95aeae338413690b8a2 [diff] | |
| parent | 7dac745b8e367c99175b8f0d014d996f0e5ed9e5 [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: give up hardreset on nf2 libata-sff: fix 32-bit PIO ATAPI regression