From: Peter Maydell Date: Sat, 28 Mar 2015 10:10:04 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging X-Git-Tag: qemu-xen-4.7.0-rc1~374 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=627f91b1f80fecc73d00727181a9ddb6162cc30e;p=qemu-xen.git Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging # gpg: Signature made Fri Mar 27 22:19:31 2015 GMT 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: Protect cmd register AHCI: Do not (re)map FB/CLB buffers while not running Signed-off-by: Peter Maydell --- 627f91b1f80fecc73d00727181a9ddb6162cc30e