diff options
| author | Peter Maydell | 2015-07-21 11:04:32 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-07-21 11:04:32 +0200 |
| commit | a1bc040dabc12039944e22d9529f20d6132400dd (patch) | |
| tree | 68b04651bfb3077e08bc60b0b2fe1dc36412fa33 /qga/qapi-schema.json | |
| parent | Merge remote-tracking branch 'remotes/stefanha/tags/net-pull-request' into st... (diff) | |
| parent | tests: Fix broken targets check-report-qtest-* (diff) | |
| download | qemu-a1bc040dabc12039944e22d9529f20d6132400dd.tar.gz qemu-a1bc040dabc12039944e22d9529f20d6132400dd.tar.xz qemu-a1bc040dabc12039944e22d9529f20d6132400dd.zip | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Mon Jul 20 19:27:04 2015 BST using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB
# Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E
* remotes/jnsnow/tags/ide-pull-request:
tests: Fix broken targets check-report-qtest-*
ahci: Force ICC bits in PxCMD to zero
qtest/ide: add another short PRDT test flavor
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qga/qapi-schema.json')
0 files changed, 0 insertions, 0 deletions