Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
commit9f6bd36c407f30c388c5de66c831e1968eec0367
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 May 2011 19:19:18 +0000 (14 12:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 May 2011 19:19:18 +0000 (14 12:19 -0700)
tree649de9788cba56933f094b095fa70bc7d8854209
parent05bf86b4ccfd0f197da61c67bd372111d15a6620
parent5f6f12ccf3aa42cfc0c5bde9228df0c843dd63f7
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 oops when LPM is used with PMP