]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commit
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Sat, 28 Mar 2015 10:10:04 +0000 (10:10 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Sat, 28 Mar 2015 10:10:04 +0000 (10:10 +0000)
commit627f91b1f80fecc73d00727181a9ddb6162cc30e
tree574c1e3c0687d8379ea17dc95aa0316cdab2dc36
parentb27e767e8c8d56cb7c9d0b78eadd89521bdf836c
parentfc3d8e1138cd0c843d6fd75272633a31be6554ef
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) <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: Protect cmd register
  AHCI: Do not (re)map FB/CLB buffers while not running

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>