commit | 006d5c741bbfcdbedeb59e14527fe58d45c9c76b | [log] [tgz] |
---|---|---|
author | Peter Maydell <peter.maydell@linaro.org> | Tue Oct 06 12:09:56 2015 +0100 |
committer | Peter Maydell <peter.maydell@linaro.org> | Tue Oct 06 12:09:56 2015 +0100 |
tree | 9b7a95c315e702ec6bab2277b8f2a2176d96e8a5 | |
parent | 7fe34ca9c2e99560dc65395d599a6920624b127d [diff] | |
parent | ec6b69ca0305ab3a3e0461aecb6f190c59a765df [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>