git.proxmox.com Git - qemu.git/commit

]> git.proxmox.com Git - qemu.git/commit

author	Andreas Färber <afaerber@suse.de>
	Sat, 22 Dec 2012 23:39:34 +0000 (00:39 +0100)
committer	Andreas Färber <afaerber@suse.de>
	Sat, 22 Dec 2012 23:40:49 +0000 (00:40 +0100)
commit	501a7ce7270955be151c442c27620fa7af2f3ce5
tree	0374e4d581a0246074d55712b81baf01f3c439b6	tree
parent	62e0c095450f6a7eb37914991f3f7966aa4da7a1	commit \| diff
parent	36f25d2537c40c6c47f4abee5d31a24863d1adf7	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
hw/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/alpha_dp264.c	diff1 \|	diff2 \|	blob \| history
hw/alpha_sys.h	diff1 \|	diff2 \|	blob \| history
hw/alpha_typhoon.c	diff1 \|	diff2 \|	blob \| history
hw/kvm/apic.c	diff1 \|	diff2 \|	blob \| history
hw/kvm/clock.c	diff1 \|	diff2 \|	blob \| history
hw/ppc.c	diff1 \|	diff2 \|	blob \| history
hw/ppc.h	diff1 \|	diff2 \|	blob \| history
hw/ppc/e500.c	diff1 \|	diff2 \|	blob \| history
hw/ppc405_uc.c	diff1 \|	diff2 \|	blob \| history
hw/ppc440_bamboo.c	diff1 \|	diff2 \|	blob \| history
hw/ppc4xx.h	diff1 \|	diff2 \|	blob \| history
hw/ppc4xx_devs.c	diff1 \|	diff2 \|	blob \| history
hw/ppc_booke.c	diff1 \|	diff2 \|	blob \| history
hw/qdev-properties-system.c	diff1 \|	\|	blob \| history
hw/qdev-properties.c	diff1 \|	diff2 \|	blob \| history
hw/qdev.c	diff1 \|	diff2 \|	blob \| history
hw/s390-virtio-bus.c	diff1 \|	diff2 \|	blob \| history
hw/spapr.c	diff1 \|	diff2 \|	blob \| history
hw/virtex_ml507.c	diff1 \|	diff2 \|	blob \| history
include/exec/cpu-common.h	\|	diff2 \|	blob \| history
include/exec/cpu-defs.h	\|	diff2 \|	blob \| history
include/qom/cpu.h	\|	diff2 \|	blob \| history
include/sysemu/kvm.h	\|	diff2 \|	blob \| history
kvm-all.c	diff1 \|	diff2 \|	blob \| history
target-alpha/cpu-qom.h	diff1 \|	diff2 \|	blob \| history
target-alpha/cpu.c	diff1 \|	diff2 \|	blob \| history
target-alpha/cpu.h	diff1 \|	diff2 \|	blob \| history
target-alpha/sys_helper.c	diff1 \|	diff2 \|	blob \| history
target-alpha/translate.c	diff1 \|	diff2 \|	blob \| history
target-arm/helper.c	diff1 \|	diff2 \|	blob \| history
target-i386/cpu.c	diff1 \|	diff2 \|	blob \| history
target-i386/kvm.c	diff1 \|	diff2 \|	blob \| history
target-m68k/helper.c	diff1 \|	diff2 \|	blob \| history
target-ppc/kvm.c	diff1 \|	diff2 \|	blob \| history
target-ppc/kvm_ppc.h	diff1 \|	diff2 \|	blob \| history
target-s390x/cpu.h	diff1 \|	diff2 \|	blob \| history
target-s390x/interrupt.c	diff1 \|	diff2 \|	blob \| history
target-s390x/kvm.c	diff1 \|	diff2 \|	blob \| history
target-s390x/misc_helper.c	diff1 \|	diff2 \|	blob \| history

Qemu copy for testing

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
hw/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/alpha_dp264.c	diff1 \|	diff2 \|	blob \| history
hw/alpha_sys.h	diff1 \|	diff2 \|	blob \| history
hw/alpha_typhoon.c	diff1 \|	diff2 \|	blob \| history
hw/kvm/apic.c	diff1 \|	diff2 \|	blob \| history
hw/kvm/clock.c	diff1 \|	diff2 \|	blob \| history
hw/ppc.c	diff1 \|	diff2 \|	blob \| history
hw/ppc.h	diff1 \|	diff2 \|	blob \| history
hw/ppc/e500.c	diff1 \|	diff2 \|	blob \| history
hw/ppc405_uc.c	diff1 \|	diff2 \|	blob \| history
hw/ppc440_bamboo.c	diff1 \|	diff2 \|	blob \| history
hw/ppc4xx.h	diff1 \|	diff2 \|	blob \| history
hw/ppc4xx_devs.c	diff1 \|	diff2 \|	blob \| history
hw/ppc_booke.c	diff1 \|	diff2 \|	blob \| history
hw/qdev-properties-system.c	diff1 \|	\|	blob \| history
hw/qdev-properties.c	diff1 \|	diff2 \|	blob \| history
hw/qdev.c	diff1 \|	diff2 \|	blob \| history
hw/s390-virtio-bus.c	diff1 \|	diff2 \|	blob \| history
hw/spapr.c	diff1 \|	diff2 \|	blob \| history
hw/virtex_ml507.c	diff1 \|	diff2 \|	blob \| history
include/exec/cpu-common.h	\|	diff2 \|	blob \| history
include/exec/cpu-defs.h	\|	diff2 \|	blob \| history
include/qom/cpu.h	\|	diff2 \|	blob \| history
include/sysemu/kvm.h	\|	diff2 \|	blob \| history
kvm-all.c	diff1 \|	diff2 \|	blob \| history
target-alpha/cpu-qom.h	diff1 \|	diff2 \|	blob \| history
target-alpha/cpu.c	diff1 \|	diff2 \|	blob \| history
target-alpha/cpu.h	diff1 \|	diff2 \|	blob \| history
target-alpha/sys_helper.c	diff1 \|	diff2 \|	blob \| history
target-alpha/translate.c	diff1 \|	diff2 \|	blob \| history
target-arm/helper.c	diff1 \|	diff2 \|	blob \| history
target-i386/cpu.c	diff1 \|	diff2 \|	blob \| history
target-i386/kvm.c	diff1 \|	diff2 \|	blob \| history
target-m68k/helper.c	diff1 \|	diff2 \|	blob \| history
target-ppc/kvm.c	diff1 \|	diff2 \|	blob \| history
target-ppc/kvm_ppc.h	diff1 \|	diff2 \|	blob \| history
target-s390x/cpu.h	diff1 \|	diff2 \|	blob \| history
target-s390x/interrupt.c	diff1 \|	diff2 \|	blob \| history
target-s390x/kvm.c	diff1 \|	diff2 \|	blob \| history
target-s390x/misc_helper.c	diff1 \|	diff2 \|	blob \| history