motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 16:53:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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

Signed-off-by: Andreas Färber <andreas.faerber@web.de>
This commit is contained in:
Andreas Färber 2013-01-10 21:52:28 +01:00
commit 63e3555e80
1953 changed files with 109215 additions and 41440 deletions
Download patch file Download diff file Expand all files Collapse all files

5
hw/pc87312.c
View file

@ -24,8 +24,9 @@
*/
#include "pc87312.h"
#include "blockdev.h"
#include "sysemu.h"
#include "sysemu/blockdev.h"
#include "sysemu/sysemu.h"
#include "char/char.h"
#include "trace.h"