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