| commit | 2bb15bddf2607110820d5ce5aa43baac27292fb3 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 9 Aug 2016 15:53:32 +0000 (9 16:53 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 9 Aug 2016 15:53:32 +0000 (9 16:53 +0100) | ||
| tree | 5e9722a117865138d73691eaa41e022ec2fa0730 | treesnapshot (tar.gz zip) |
| parent | ab861f3915e8667927cf18ad97f71cae7ccf8818 | commitdiff |
| parent | 7f951b2d7765f68ae1e563c2fed44071ca774790 | commitdiff |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Tue 09 Aug 2016 16:47:32 BST
# 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:
atapi: fix halted DMA reset
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# gpg: Signature made Tue 09 Aug 2016 16:47:32 BST
# 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:
atapi: fix halted DMA reset
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>