Merge branch 'master' of git://git.qemu.org/qemu into qom-cpu
authorAndreas Färber <afaerber@suse.de>
Sat, 22 Dec 2012 23:39:34 +0000 (00:39 +0100)
committerAndreas Färber <afaerber@suse.de>
Sat, 22 Dec 2012 23:40:49 +0000 (00:40 +0100)
commit501a7ce7270955be151c442c27620fa7af2f3ce5
tree0374e4d581a0246074d55712b81baf01f3c439b6
parent62e0c095450f6a7eb37914991f3f7966aa4da7a1
parent36f25d2537c40c6c47f4abee5d31a24863d1adf7
Merge branch 'master' of git://git.qemu.org/qemu into qom-cpu

Adapt header include paths.

Signed-off-by: Andreas Färber <afaerber@suse.de>
41 files changed:
MAINTAINERS
hw/Makefile.objs
hw/alpha_dp264.c
hw/alpha_sys.h
hw/alpha_typhoon.c
hw/kvm/apic.c
hw/kvm/clock.c
hw/ppc.c
hw/ppc.h
hw/ppc/e500.c
hw/ppc405_uc.c
hw/ppc440_bamboo.c
hw/ppc4xx.h
hw/ppc4xx_devs.c
hw/ppc_booke.c
hw/qdev-properties-system.c
hw/qdev-properties.c
hw/qdev.c
hw/s390-virtio-bus.c
hw/spapr.c
hw/virtex_ml507.c
include/exec/cpu-common.h
include/exec/cpu-defs.h
include/qom/cpu.h
include/sysemu/kvm.h
kvm-all.c
target-alpha/cpu-qom.h
target-alpha/cpu.c
target-alpha/cpu.h
target-alpha/sys_helper.c
target-alpha/translate.c
target-arm/helper.c
target-i386/cpu.c
target-i386/kvm.c
target-m68k/helper.c
target-ppc/kvm.c
target-ppc/kvm_ppc.h
target-s390x/cpu.h
target-s390x/interrupt.c
target-s390x/kvm.c
target-s390x/misc_helper.c