projects / qemu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7fe34ca ec6b69c)
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 6 Oct 2015 11:09:56 +0000 (12:09 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 6 Oct 2015 11:09:56 +0000 (12:09 +0100)
commit006d5c741bbfcdbedeb59e14527fe58d45c9c76b
tree9b7a95c315e702ec6bab2277b8f2a2176d96e8a5tree | snapshot
parent7fe34ca9c2e99560dc65395d599a6920624b127dcommit | diff
parentec6b69ca0305ab3a3e0461aecb6f190c59a765dfcommit | diff
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging

# gpg: Signature made Mon 05 Oct 2015 17:01:11 BST using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"

* remotes/jnsnow/tags/ide-pull-request:
  qtest/ide-test: ppc64be correction for ATAPI tests
  MAINTAINERS: Small IDE/FDC touchup
  qtest/ahci: fix redundant assertion

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Unnamed repository; edit this file 'description' to name the repository.