| commit | 9f6bd36c407f30c388c5de66c831e1968eec0367 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 14 May 2011 19:19:18 +0000 (14 12:19 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 14 May 2011 19:19:18 +0000 (14 12:19 -0700) | ||
| tree | 649de9788cba56933f094b095fa70bc7d8854209 | treesnapshot (tar.gz zip) |
| parent | 05bf86b4ccfd0f197da61c67bd372111d15a6620 | commitdiff |
| parent | 5f6f12ccf3aa42cfc0c5bde9228df0c843dd63f7 | commitdiff |
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
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
libata: fix oops when LPM is used with PMP