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>
This commit is contained in:
Andreas Färber 2012-12-23 00:39:34 +01:00
commit 501a7ce727
1126 changed files with 3773 additions and 4070 deletions

View file

@ -24,8 +24,8 @@
#include "hw.h"
#include "ppc.h"
#include "ppc4xx.h"
#include "qemu-log.h"
#include "exec-memory.h"
#include "qemu/log.h"
#include "exec/address-spaces.h"
//#define DEBUG_MMIO
//#define DEBUG_UNASSIGNED