The following changes since commit 4b6eda626fdb8bf90472c6868d502a2ac09abeeb:
Merge remote-tracking branch 'remotes/lalrae/tags/mips-20151124' into staging (2015-11-24 17:05:06 +0000) are available in the git repository at: https://github.com/jnsnow/qemu.git tags/ide-pull-request for you to fetch changes up to 9c73517ca56d6611371376bd298b4b20f3ad6140: ide-test: fix timeouts (2015-11-25 11:37:34 -0500) ---------------------------------------------------------------- ---------------------------------------------------------------- Alberto Garcia (2): atapi: Account for failed and invalid operations in cd_read_sector() atapi: Fix code indentation John Snow (2): ide-test: cdrom_pio_impl fixup ide-test: fix timeouts hw/ide/atapi.c | 8 +++++--- tests/ide-test.c | 32 +++++++++++++++++++++++--------- 2 files changed, 28 insertions(+), 12 deletions(-) -- 2.4.3
