Revision 63e3555e
| ID | 63e3555e80c31776285accbb4d0c14ae91c457dc |
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>
Files
- added
- modified
- copied
- renamed
- deleted