Merge remote-tracking branch 'kwolf/for-anthony' into staging

diff --cc cpus.c
Simple merge

diff --cc hw/ide/ahci.c
Simple merge

diff --cc hw/ide/core.c
Simple merge

diff --cc hw/scsi-disk.c
Simple merge