Merge branch 'for-kvm' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 11 Oct 2013 07:23:53 +0000 (18:23 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 11 Oct 2013 07:23:53 +0000 (18:23 +1100)
commit3ad26e5c4459d3793ad65bc8929037c70515df83
tree434327df7942878383e372988eb5f3bccb25de12
parent5293bf97a27e1be8ac6096aa198ff6a9e3e6837c
parent18461960cbf50bf345ef0667d45d5f64de8fb893
Merge branch 'for-kvm' into next

Topic branch for commits that the KVM tree might want to pull
in separately.

Hand merged a few files due to conflicts with the LE stuff

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/include/asm/machdep.h
arch/powerpc/include/asm/ppc_asm.h
arch/powerpc/include/asm/processor.h
arch/powerpc/kernel/align.c
arch/powerpc/kernel/ppc_ksyms.c
arch/powerpc/kernel/ptrace.c
arch/powerpc/kernel/signal_32.c
arch/powerpc/kernel/signal_64.c
arch/powerpc/platforms/powernv/pci-ioda.c
arch/powerpc/platforms/powernv/pci.c
arch/powerpc/platforms/powernv/pci.h