From: Peter Maydell Date: Wed, 13 Apr 2016 15:32:28 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~30^2~6^2~8^2~45 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c0bc0fa352ffc7f0a89038ef594b0df8b6bfcf1b;p=sdk%2Femulator%2Fqemu.git Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging # gpg: Signature made Wed 13 Apr 2016 00:32:22 BST using RSA key ID AAFC390E # gpg: Good signature from "John Snow (John Huston) " * remotes/jnsnow/tags/ide-pull-request: ide: really restart pending and in-flight atapi dma ide: restart atapi dma by re-evaluating command packet ide: don't lose pending dma state xen: Fix IDE unplug Signed-off-by: Peter Maydell --- c0bc0fa352ffc7f0a89038ef594b0df8b6bfcf1b