diff options
| author | Peter Maydell | 2016-09-06 21:03:58 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-09-06 21:03:58 +0200 |
| commit | 7faae0b36e51ffdb17d4716ddc40dcfa682d93d9 (patch) | |
| tree | f08788b23327d24c3c1a400fc919e2d74e5c0dc8 /linux-user/main.c | |
| parent | Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff) | |
| parent | block: m25p80: Fix vmstate structure name (diff) | |
| download | qemu-7faae0b36e51ffdb17d4716ddc40dcfa682d93d9.tar.gz qemu-7faae0b36e51ffdb17d4716ddc40dcfa682d93d9.tar.xz qemu-7faae0b36e51ffdb17d4716ddc40dcfa682d93d9.zip | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160906-1' into staging
target-arm queue:
* fix incorrect LPAE bit in FSR for alignment faults
* ACPI: fix the AML ID format for CPU devices to work for
large numbers of CPUs
* ast2400: add memory controller device model
* m25p80: fix the vmstate structure name (migration break)
# gpg: Signature made Tue 06 Sep 2016 20:02:28 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-20160906-1:
block: m25p80: Fix vmstate structure name
ARM: ACPI: fix the AML ID format for CPU devices
target-arm: Fix lpae bit in FSR on an alignment fault
ast2400: add a memory controller device model
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/main.c')
0 files changed, 0 insertions, 0 deletions