]> 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>
Sat, 14 May 2011 19:19:18 +0000 (12:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 May 2011 19:19:18 +0000 (12:19 -0700)
commit2a75f1836f9301bbfa2d10dfda2d21a5568f2008
tree649de9788cba56933f094b095fa70bc7d8854209
parente0e91b2f7f39b914a23bc07f0c21e4075f23f9c3
parentf554c6b18d8d2b35235c5345487bcfc6f76b2099
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 oops when LPM is used with PMP