| commit | dfe732fb68ef9195517f4f380a477d58a054edc1 | |
| author | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 27 Mar 2018 15:25:12 +0000 (27 16:25 +0100) | ||
| committer | Peter Maydell <peter.maydell@linaro.org> | |
| Tue, 27 Mar 2018 15:25:12 +0000 (27 16:25 +0100) | ||
| tree | d57175cba00f6a531cc0bf358dceb5b7535d2d12 | treesnapshot (tar.gz zip) |
| parent | 62d0289662746585239fbbf6a8d548f37f5fe6a8 | commitdiff |
| parent | eb69953ecb1cbe7b4c4093a97a4dab3daa315d4e | commitdiff |
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>
# 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>