Merge branch 'master' of git://git.qemu.org/qemu into prep-up
authorAndreas Färber <andreas.faerber@web.de>
Thu, 10 Jan 2013 20:52:28 +0000 (21:52 +0100)
committerAndreas Färber <andreas.faerber@web.de>
Thu, 10 Jan 2013 20:52:28 +0000 (21:52 +0100)
commit63e3555e80c31776285accbb4d0c14ae91c457dc
tree89907c82724d6519c8bbad7acc15c0198c6f902f
parent52a71bff6085398fbb8602718af228cd6339c02d
parenta6308bc2224db238e72c570482717b68246a7ce0
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
hw/Makefile.objs
hw/pc87312.c
hw/ppc_prep.c
trace-events