]> 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)
commit5bb14246ac8e76b7c2d8554ae89043cb85db20f0
treead81395d2179c44f3ab2a0762a37b409b5536517
parentf1d3fcaa295f1e373b7d3acadd7d8d148a090ae9
parent060bb724054b7eb5e7bb80d503ddbac9b6447248
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()