Merge remote branch 'qemu-kvm/uq/master' into staging

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

Mon, 22 Feb 2010 22:16:22 +0000 (16:16 -0600)

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

Mon, 22 Feb 2010 22:16:22 +0000 (16:16 -0600)
author Anthony Liguori <aliguori@us.ibm.com>
Mon, 22 Feb 2010 22:16:22 +0000 (16:16 -0600)
committer Anthony Liguori <aliguori@us.ibm.com>
Mon, 22 Feb 2010 22:16:22 +0000 (16:16 -0600)
diff --cc cpu-exec.c
Simple merge
diff --cc qemu-common.h
Simple merge
diff --cc target-i386/kvm.c
Simple merge
diff --cc vl.c
Simple merge
author	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 22 Feb 2010 22:16:22 +0000 (16:16 -0600)
committer	Anthony Liguori <aliguori@us.ibm.com>
	Mon, 22 Feb 2010 22:16:22 +0000 (16:16 -0600)
		1	2
cpu-exec.c	patch \|	diff1 \|	diff2 \|	blob \| history
qemu-common.h	patch \|	diff1 \|	diff2 \|	blob \| history
target-i386/kvm.c	patch \|	diff1 \|	diff2 \|	blob \| history
vl.c	patch \|	diff1 \|	diff2 \|	blob \| history