From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 14 Jun 2010 15:33:36 +0000 (-0500)
Subject: Merge remote branch 'kwolf/for-anthony' into staging
X-Git-Tag: v0.13.0-rc0~263
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a4673e276248ada38f40d39191a197e7e35d3f8b;p=thirdparty%2Fqemu.git

Merge remote branch 'kwolf/for-anthony' into staging

Conflicts:
	hw/pc.c
---

a4673e276248ada38f40d39191a197e7e35d3f8b
diff --cc hw/pc.c
index 14911297eae,6e7c4689061..0f7d330609a
--- a/hw/pc.c
+++ b/hw/pc.c
@@@ -35,7 -35,7 +35,8 @@@
  #include "elf.h"
  #include "multiboot.h"
  #include "mc146818rtc.h"
 +#include "sysbus.h"
+ #include "sysemu.h"
  
  /* output Bochs bios info messages */
  //#define DEBUG_BIOS