summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-28 04:31:10 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-28 04:31:10 +0200
commitd7e69bc73c423723c30b5cd3d4b1d72c06ed22e6 (patch)
tree5fe02b0bc3b3883036d76fda82cc13c1966ae7da /drivers/pci
parentMerge branch 'docs-3.4' of git://git.samba.org/jlayton/linux (diff)
parentMerge branch 'sh/urgent' into sh-fixes-for-linus (diff)
downloadlinux-d7e69bc73c423723c30b5cd3d4b1d72c06ed22e6.tar.xz
linux-d7e69bc73c423723c30b5cd3d4b1d72c06ed22e6.zip
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
Pull SuperH fixes from Paul Mundt. * tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: sh: Fix up tracepoint build fallout from static key introduction. sh: Fix error synchronising kernel page tables
Diffstat (limited to 'drivers/pci')
0 files changed, 0 insertions, 0 deletions