diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-24 10:01:15 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-24 10:01:15 +0100 |
| commit | df95f1a298a3e16c80293343143dcedbe7978f6c (patch) | |
| tree | 5d847a03b9f475ac7ca6f8005cc2aba4d2470907 /qobject/json-parser.c | |
| parent | 91939262ffcd3c85ea6a4793d3029326eea1d649 (diff) | |
| parent | 7fb394ad8a7c4609cefa2136dec16cf65d028f40 (diff) | |
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20170721-tag' into staging
Xen 2017/07/21
# gpg: Signature made Sat 22 Jul 2017 01:43:34 BST
# gpg: using RSA key 0x894F8F4870E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
# gpg: aka "Stefano Stabellini <sstabellini@kernel.org>"
# Primary key fingerprint: D04E 33AB A51F 67BA 07D3 0AEA 894F 8F48 70E1 AE90
* remotes/sstabellini/tags/xen-20170721-tag:
xen-mapcache: Fix the bug when overlapping emulated DMA operations may cause inconsistency in guest memory mappings
xen: fix compilation on 32-bit hosts
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qobject/json-parser.c')
0 files changed, 0 insertions, 0 deletions