Merge branch 'master' of ../qemu-iwj

author Ian Jackson <ian.jackson@eu.citrix.com>

Thu, 23 Oct 2008 14:06:53 +0000 (15:06 +0100)

committer Ian Jackson <Ian.Jackson@eu.citrix.com>

Thu, 23 Oct 2008 14:06:53 +0000 (15:06 +0100)
author Ian Jackson <ian.jackson@eu.citrix.com>
Thu, 23 Oct 2008 14:06:53 +0000 (15:06 +0100)
committer Ian Jackson <Ian.Jackson@eu.citrix.com>
Thu, 23 Oct 2008 14:06:53 +0000 (15:06 +0100)
diff --cc xen-hooks.mak

index 95611f16340b80292f7910edeaf091a9a24da4e0,e87455285d64133f1b9e0a86dc1cafa0c8d4a4aa..205280f5a75b0f5e725e61c80c79dee36fc9bddb
--- 1/xen-hooks.mak
--- 2/xen-hooks.mak
+++ b/xen-hooks.mak
@@@ -32,7 -32,7 +32,8 @@@ OBJS += xen_console.
   OBJS += xen_machine_fv.o
   OBJS += exec-dm.o
   OBJS += pci_emulation.o
+ +OBJS += helper2.o
+ OBJS += battery_mgmt.o
   
   ifdef CONFIG_STUBDOM
   CPPFLAGS += $(TARGET_CPPFLAGS)
diff --cc xenstore.c
Simple merge
author	Ian Jackson <ian.jackson@eu.citrix.com>
	Thu, 23 Oct 2008 14:06:53 +0000 (15:06 +0100)
committer	Ian Jackson <Ian.Jackson@eu.citrix.com>
	Thu, 23 Oct 2008 14:06:53 +0000 (15:06 +0100)
		1	2
xen-hooks.mak	patch \|	diff1 \|	diff2 \|	blob \| history
xenstore.c	patch \|	diff1 \|	diff2 \|	blob \| history