diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-07-24 18:15:45 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-07-24 18:15:45 +0100 |
| commit | b5a74cd81d76cb467552f38f2b39520d07c65ea2 (patch) | |
| tree | f6b22857e898088e573c0eb4c9e7b0d32f30070a /hw/vfio/ccw.c | |
| parent | 50104f5ac537eecc890c65e99362df47bac3f9d9 (diff) | |
| parent | b2d1b0507d1b80f23da12dd8aab56944fe380a09 (diff) | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20170724' into staging
target-arm queue:
* fix a TCG temporary leak in aarch64 rev16
* fsl_imx*: migrate the ROM contents
* integratorcp: don't use vmstate_register_ram_global for flash
* mps2: Correctly set parent bus for SCC device
# gpg: Signature made Mon 24 Jul 2017 18:05:06 BST
# gpg: using RSA key 0x3C2525ED14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"
# gpg: aka "Peter Maydell <pmaydell@gmail.com>"
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>"
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83 15CF 3C25 25ED 1436 0CDE
* remotes/pmaydell/tags/pull-target-arm-20170724:
integratorcp: Don't migrate flash using vmstate_register_ram_global()
mps2: Correctly set parent bus for SCC device
fsl_imx*: Migrate ROM contents
target/arm: fix TCG temp leak in aarch64 rev16
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/vfio/ccw.c')
0 files changed, 0 insertions, 0 deletions