Merge remote-tracking branch 'lsk/v3.10/topic/kvm' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Fri, 10 Oct 2014 23:38:34 +0000 (00:38 +0100)
committerMark Brown <broonie@kernel.org>
Sat, 11 Oct 2014 10:28:22 +0000 (11:28 +0100)
commitaea5b31b7df7526dcb07000a50d35f3df3e6c283
treec5f02bbdfac69a0165a3f366dc8f1a85ed459d3f
parent1ab056a5fb0d123436b862806734c6a9dc4651a4
parent2606d2448703e8995ca39a59d8a1106a1e0f034a
Merge remote-tracking branch 'lsk/v3.10/topic/kvm' into linux-linaro-lsk

Conflicts:
arch/arm/kvm/arm.c
arch/arm64/Makefile
arch/arm64/kernel/asm-offsets.c
virt/kvm/kvm_main.c
26 files changed:
MAINTAINERS
arch/arm/include/asm/assembler.h
arch/arm/include/asm/pgtable-3level.h
arch/arm/include/asm/pgtable.h
arch/arm/kernel/perf_event_cpu.c
arch/arm/kernel/smp.c
arch/arm/mm/idmap.c
arch/arm64/Kconfig
arch/arm64/Makefile
arch/arm64/include/asm/cputype.h
arch/arm64/kernel/asm-offsets.c
arch/arm64/kernel/debug-monitors.c
arch/arm64/mm/proc.S
arch/mips/kvm/kvm_mips.c
arch/powerpc/kvm/book3s_hv.c
arch/x86/include/asm/kvm_host.h
arch/x86/kvm/mmu.c
arch/x86/kvm/paging_tmpl.h
arch/x86/kvm/svm.c
arch/x86/kvm/vmx.c
arch/x86/kvm/x86.c
include/linux/irqchip/arm-gic.h
include/linux/mm.h
mm/memory.c
virt/kvm/ioapic.c
virt/kvm/iommu.c