]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Thu, 16 Mar 2017 10:04:41 +0000 (10:04 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Thu, 16 Mar 2017 10:04:41 +0000 (10:04 +0000)
commit7c756380281504900aa77af3233463cf3d37ad8f
treeb86aede3eee5162aa98edfda11365dbed028452d
parent5b467b908162ebf329e8bea131b264caaab2386c
parentd68f0f778e7f4fbd674627274267f269e40f0b04
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging

# gpg: Signature made Thu 16 Mar 2017 00:52:41 GMT
# gpg:                using RSA key 0x7DEF8106AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
# 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:
  ide: ahci: call cleanup function in ahci unit
  ide: core: add cleanup function
  ide: qdev: register ide bus unrealize function

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