diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-08-03 10:44:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-08-03 10:44:23 +0100 |
| commit | ff90f84e74d7c8641a493585ba9ea8d6e0d19855 (patch) | |
| tree | bd9cb0c147fcef6097a9a6b9cb2140538da41c5f /target-i386 | |
| parent | cb48f67ad8c7b33c617d4f8144a27706e69fd688 (diff) | |
| parent | 91ced514461e1a533bfb9e2eea32bd7df678b1cd (diff) | |
| download | qemu-ff90f84e74d7c8641a493585ba9ea8d6e0d19855.zip qemu-ff90f84e74d7c8641a493585ba9ea8d6e0d19855.tar.gz qemu-ff90f84e74d7c8641a493585ba9ea8d6e0d19855.tar.bz2 | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Fri Jul 31 23:24:06 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:
ahci: fix ICC mask definition
macio: re-add TRIM support
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-i386')
0 files changed, 0 insertions, 0 deletions