| commit | 45694c2895c194ffa74becde4120af6eb6afeefe | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 09 20:14:21 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 09 20:14:21 2011 -0700 |
| tree | ad81395d2179c44f3ab2a0762a37b409b5536517 | |
| parent | 7f45e5cd1718ed769295033ca214032848a0097d [diff] | |
| parent | 8c56cacc724c7650b893d43068fa66044aa29a61 [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: libata: fix unexpectedly frozen port after ata_eh_reset()