author | Linus Torvalds <torvalds@linux-foundation.org> | |
Fri, 10 Jun 2011 03:14:21 +0000 (20:14 -0700) | ||
committer | Linus Torvalds <torvalds@linux-foundation.org> | |
Fri, 10 Jun 2011 03:14:21 +0000 (20:14 -0700) |
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: fix unexpectedly frozen port after ata_eh_reset()
libata: fix unexpectedly frozen port after ata_eh_reset()
Trivial merge