tree 649de9788cba56933f094b095fa70bc7d8854209
parent 05bf86b4ccfd0f197da61c67bd372111d15a6620
parent 5f6f12ccf3aa42cfc0c5bde9228df0c843dd63f7
author Linus Torvalds <torvalds@linux-foundation.org> 1305400758 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1305400758 -0700

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