]> git.proxmox.com Git - mirror_qemu.git/commitdiff
projects / mirror_qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7933a8 9c73517)
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Nov 2015 09:44:25 +0000 (09:44 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 26 Nov 2015 09:44:25 +0000 (09:44 +0000)
# gpg: Signature made Wed 25 Nov 2015 20:25:21 GMT using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"

* remotes/jnsnow/tags/ide-pull-request:
  ide-test: fix timeouts
  atapi: Fix code indentation
  atapi: Account for failed and invalid operations in cd_read_sector()
  ide-test: cdrom_pio_impl fixup

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge
QEMU mirror