Merge remote branch 'mst/for_anthony' into staging
commitea3fdd5d8ca8d5055942e42151480ab5611396c7
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 6 Jan 2010 13:16:59 +0000 (6 07:16 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 6 Jan 2010 13:16:59 +0000 (6 07:16 -0600)
treea01fb01d46612436a8b00d1c159273bad7597858
parentdffbe21746fc7a8b66fbbdf15f74eefccd8edafd
parent1cd9656f27bd3b6dc85ad16adeeca88daa1aa14b
Merge remote branch 'mst/for_anthony' into staging
hw/e1000.c
hw/lsi53c895a.c
hw/pci.c
hw/pci.h