v2 pull: * dropped the ast2500 patches * fix ast2400 memory controller format string bug
thanks -- PMM The following changes since commit 2926375cffce464fde6b4dabaed1e133d549af39: Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2016-09-06 17:18:17 +0100) are available in the git repository at: git://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20160906-1 for you to fetch changes up to c827c06a4dd6c768eeb3aaa6af6cfd29663116af: block: m25p80: Fix vmstate structure name (2016-09-06 19:52:18 +0100) ---------------------------------------------------------------- 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) ---------------------------------------------------------------- Cédric Le Goater (1): ast2400: add a memory controller device model Marcin Krzeminski (1): block: m25p80: Fix vmstate structure name Sergey Sorokin (1): target-arm: Fix lpae bit in FSR on an alignment fault Wei Huang (1): ARM: ACPI: fix the AML ID format for CPU devices hw/arm/ast2400.c | 15 +++ hw/arm/virt-acpi-build.c | 2 +- hw/block/m25p80.c | 29 +++-- hw/misc/Makefile.objs | 2 +- hw/misc/aspeed_sdmc.c | 263 ++++++++++++++++++++++++++++++++++++++++++ include/hw/arm/ast2400.h | 2 + include/hw/misc/aspeed_sdmc.h | 31 +++++ target-arm/op_helper.c | 2 +- 8 files changed, 328 insertions(+), 18 deletions(-) create mode 100644 hw/misc/aspeed_sdmc.c create mode 100644 include/hw/misc/aspeed_sdmc.h