Merge remote branch 'mst/for_anthony' into staging

author Anthony Liguori <aliguori@us.ibm.com>

Mon, 1 Nov 2010 15:33:45 +0000 (10:33 -0500)

committer Anthony Liguori <aliguori@us.ibm.com>

Mon, 1 Nov 2010 15:33:45 +0000 (10:33 -0500)
author Anthony Liguori <aliguori@us.ibm.com>
Mon, 1 Nov 2010 15:33:45 +0000 (10:33 -0500)
committer Anthony Liguori <aliguori@us.ibm.com>
Mon, 1 Nov 2010 15:33:45 +0000 (10:33 -0500)
diff --cc Makefile
Simple merge
diff --cc Makefile.objs
Simple merge
diff --cc arch_init.c
Simple merge
diff --cc qemu-common.h
Simple merge
author	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 1 Nov 2010 15:33:45 +0000 (10:33 -0500)
committer	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 1 Nov 2010 15:33:45 +0000 (10:33 -0500)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile.objs	patch \|	diff1 \|	diff2 \|	blob \| history
arch_init.c	patch \|	diff1 \|	diff2 \|	blob \| history
qemu-common.h	patch \|	diff1 \|	diff2 \|	blob \| history