Merge remote branch 'mst/for_anthony' into staging

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

Wed, 6 Jan 2010 13:16:59 +0000 (07:16 -0600)

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

Wed, 6 Jan 2010 13:16:59 +0000 (07:16 -0600)
author Anthony Liguori <aliguori@us.ibm.com>
Wed, 6 Jan 2010 13:16:59 +0000 (07:16 -0600)
committer Anthony Liguori <aliguori@us.ibm.com>
Wed, 6 Jan 2010 13:16:59 +0000 (07:16 -0600)
diff --cc hw/e1000.c
Simple merge
diff --cc hw/lsi53c895a.c
Simple merge
diff --cc hw/pci.c
Simple merge
diff --cc hw/pci.h
Simple merge
author	Anthony Liguori <aliguori@us.ibm.com>
	Wed, 6 Jan 2010 13:16:59 +0000 (07:16 -0600)
committer	Anthony Liguori <aliguori@us.ibm.com>
	Wed, 6 Jan 2010 13:16:59 +0000 (07:16 -0600)
		1	2
hw/e1000.c	patch \|	diff1 \|	diff2 \|	blob \| history
hw/lsi53c895a.c	patch \|	diff1 \|	diff2 \|	blob \| history
hw/pci.c	patch \|	diff1 \|	diff2 \|	blob \| history
hw/pci.h	patch \|	diff1 \|	diff2 \|	blob \| history