summaryrefslogtreecommitdiffstats
path: root/arch/s390/pci
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2013-11-04 09:20:57 +0100
committerGleb Natapov <gleb@redhat.com>2013-11-04 09:20:57 +0100
commit95f328d3ad1a8e4e3175a18546fb35c495e31130 (patch)
tree2f6496ef8354e9a0a315f23faef744f93fee8265 /arch/s390/pci
parentKVM: x86: fix emulation of "movzbl %bpl, %eax" (diff)
parentkvm: powerpc: book3s: drop is_hv_enabled (diff)
downloadlinux-95f328d3ad1a8e4e3175a18546fb35c495e31130.tar.xz
linux-95f328d3ad1a8e4e3175a18546fb35c495e31130.zip
Merge branch 'kvm-ppc-queue' of git://github.com/agraf/linux-2.6 into queue
Conflicts: arch/powerpc/include/asm/processor.h
Diffstat (limited to 'arch/s390/pci')
0 files changed, 0 insertions, 0 deletions