summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-05-14 19:19:18 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-14 19:19:18 (GMT)
commit9f6bd36c407f30c388c5de66c831e1968eec0367 (patch)
tree649de9788cba56933f094b095fa70bc7d8854209 /include
parent05bf86b4ccfd0f197da61c67bd372111d15a6620 (diff)
parent5f6f12ccf3aa42cfc0c5bde9228df0c843dd63f7 (diff)
downloadlinux-fsl-qoriq-9f6bd36c407f30c388c5de66c831e1968eec0367.tar.xz
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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions