]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit14897204f06caae91f54ca00e6e7a9dcd0b3376f
treead81395d2179c44f3ab2a0762a37b409b5536517
parent596d5f6c34eacc71ea0d31d765b9a35261ebd6f2
parent8041872ebfe076bac01ef0e0df09e6c6caec9942
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()