| commit | c0bc0fa352ffc7f0a89038ef594b0df8b6bfcf1b | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Wed, 13 Apr 2016 15:32:28 +0000 (13 16:32 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Wed, 13 Apr 2016 15:32:29 +0000 (13 16:32 +0100) | ||
| tree | 8aed873d0e5859db34e6a8d335367e26f15efb4a | treesnapshot (tar.gz zip) |
| parent | d44122ecd0fa62d20762bdd8f214f077cb8e011b | commitdiff |
| parent | 502356eeeb5fd2bdd92b2d5156e511626c1c3814 | commitdiff |
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) <jsnow@redhat.com>"
* 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 <peter.maydell@linaro.org>
# gpg: Signature made Wed 13 Apr 2016 00:32:22 BST using RSA key ID AAFC390E
# gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>"
* 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 <peter.maydell@linaro.org>