From: Peter Maydell Date: Mon, 3 Aug 2015 09:44:23 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging X-Git-Tag: v2.4.0-rc4~10 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ff90f84e74d7c8641a493585ba9ea8d6e0d19855;p=thirdparty%2Fqemu.git 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) " # 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 --- ff90f84e74d7c8641a493585ba9ea8d6e0d19855