diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-03-27 16:25:12 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-03-27 16:25:12 +0100 |
| commit | dfe732fb68ef9195517f4f380a477d58a054edc1 (patch) | |
| tree | d57175cba00f6a531cc0bf358dceb5b7535d2d12 /linux-user/main.c | |
| parent | 62d0289662746585239fbbf6a8d548f37f5fe6a8 (diff) | |
| parent | eb69953ecb1cbe7b4c4093a97a4dab3daa315d4e (diff) | |
| download | qemu-dfe732fb68ef9195517f4f380a477d58a054edc1.zip qemu-dfe732fb68ef9195517f4f380a477d58a054edc1.tar.gz qemu-dfe732fb68ef9195517f4f380a477d58a054edc1.tar.bz2 | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
# gpg: Signature made Tue 27 Mar 2018 05:56:19 BST
# gpg: using RSA key 7DEF8106AAFC390E
# 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:
macio: fix NULL pointer dereference when issuing IDE trim
ide: fix invalid TRIM range abortion for macio
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/main.c')
0 files changed, 0 insertions, 0 deletions