Merge remote branch 'kwolf/for-anthony' into staging
commit5efb397f877fc3002c8bc764f4656f4761bd965d
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 6 Jul 2010 15:48:01 +0000 (6 10:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 6 Jul 2010 15:48:01 +0000 (6 10:48 -0500)
tree4ef1809f16a7f30f237840cdbfc5521afd4e8316
parentfb787f81e749fde8c74548f9db1472eb321b9a0c
parent33b1db1c8888b77e06c720ebef0482ed598eb384
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