]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd1d4c327e29e0fd70b7462392f2e8e81c0ee4988
tree434327df7942878383e372988eb5f3bccb25de12
parentacbf6ad910ec5a2d8e5afde55139ccbee813a0a9
parent8a73638ae55770e1bf8ae981be0430b8319228d0
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