Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Jun 2011 03:14:21 +0000 (20:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Jun 2011 03:14:21 +0000 (20:14 -0700)
commit45694c2895c194ffa74becde4120af6eb6afeefe
treead81395d2179c44f3ab2a0762a37b409b5536517
parent7f45e5cd1718ed769295033ca214032848a0097d
parent8c56cacc724c7650b893d43068fa66044aa29a61
Merge branch 'upstream-linus' of git://git./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()