Merge remote-tracking branch 'kwolf/for-anthony' into staging
commitc8af89af96dac46922f6664cf0ca238a6b1adf0d
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 20 Sep 2011 20:21:03 +0000 (20 15:21 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 20 Sep 2011 20:21:03 +0000 (20 15:21 -0500)
tree1f484f739ba85f5f9d71c3128abcbf99108a8c7c
parent39ba59c21bdc3b1dda09219919b87fe001e7d5d9
parent16a06b24306b5733a4ef2e585964838e47735a54
Merge remote-tracking branch 'kwolf/for-anthony' into staging
cpus.c
hw/ide/ahci.c
hw/ide/core.c
hw/scsi-disk.c