Merge remote branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 6 Jul 2010 15:48:01 +0000 (10:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 6 Jul 2010 15:48:01 +0000 (10:48 -0500)
commit415bd7740db3b74d3541ff349226fc8b8c7652ee
tree4ef1809f16a7f30f237840cdbfc5521afd4e8316
parent4c977805303dafaa346161f9312f9246133dfe27
parent8076cdb2a524eb0f18ac6d23445c32c74d87c39d
Merge remote branch 'kwolf/for-anthony' into staging
block-migration.c
hw/ide/macio.c
hw/ide/microdrive.c
hw/qdev.c
hw/virtio-blk.c