git.maquefel.me Git - qemu.git/commit

projects / qemu.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 52a71bf a6308bc)

author	Andreas Färber <andreas.faerber@web.de>
	Thu, 10 Jan 2013 20:52:28 +0000 (21:52 +0100)
committer	Andreas Färber <andreas.faerber@web.de>
	Thu, 10 Jan 2013 20:52:28 +0000 (21:52 +0100)
commit	63e3555e80c31776285accbb4d0c14ae91c457dc
tree	89907c82724d6519c8bbad7acc15c0198c6f902f	tree \| snapshot
parent	52a71bff6085398fbb8602718af228cd6339c02d	commit \| diff
parent	a6308bc2224db238e72c570482717b68246a7ce0	commit \| diff

Merge branch 'master' of git://git.qemu.org/qemu into prep-up

Conflicts:
hw/Makefile.objs
hw/ppc_prep.c

Signed-off-by: Andreas Färber <andreas.faerber@web.de>

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
hw/Makefile.objs	diff1 \|	diff2 \|	blob \| history
hw/pc87312.c	diff1 \|	\|	blob \| history
hw/ppc_prep.c	diff1 \|	diff2 \|	blob \| history
trace-events	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.