Merge remote branch 'origin/master' into pci

author Michael S. Tsirkin <mst@redhat.com>

Mon, 10 Jan 2011 11:43:48 +0000 (13:43 +0200)

committer Michael S. Tsirkin <mst@redhat.com>

Mon, 10 Jan 2011 11:43:48 +0000 (13:43 +0200)
author Michael S. Tsirkin <mst@redhat.com>
Mon, 10 Jan 2011 11:43:48 +0000 (13:43 +0200)
committer Michael S. Tsirkin <mst@redhat.com>
Mon, 10 Jan 2011 11:43:48 +0000 (13:43 +0200)
diff --cc Makefile.target
Simple merge
diff --cc hmp-commands.hx
Simple merge
diff --cc hw/cirrus_vga.c
Simple merge
diff --cc sysemu.h
Simple merge
diff --cc vl.c
Simple merge
author	Michael S. Tsirkin <mst@redhat.com>
	Mon, 10 Jan 2011 11:43:48 +0000 (13:43 +0200)
committer	Michael S. Tsirkin <mst@redhat.com>
	Mon, 10 Jan 2011 11:43:48 +0000 (13:43 +0200)
		1	2
Makefile.target	patch \|	diff1 \|	diff2 \|	blob \| history
hmp-commands.hx	patch \|	diff1 \|	diff2 \|	blob \| history
hw/cirrus_vga.c	patch \|	diff1 \|	diff2 \|	blob \| history
sysemu.h	patch \|	diff1 \|	diff2 \|	blob \| history
vl.c	patch \|	diff1 \|	diff2 \|	blob \| history