summaryrefslogtreecommitdiff
path: root/VERSION
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-03-30 17:32:11 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-03-30 17:32:11 +0100
commit4468d4e0f383f09c7a4df2480a2bf87fafcbe20b (patch)
tree033500f975fe01bd5277631202d0730cb1db0521 /VERSION
parent489ef4c810033e63af570c8a430af8b9858bfa5f (diff)
parentdb31e49a565fc4c165fd98201721b313c3412c1f (diff)
downloadqemu-4468d4e0f383f09c7a4df2480a2bf87fafcbe20b.tar.gz
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20160330-1' into staging
target-arm queue: * virt: fix the virtual power button by adding a modelled "key press for 100ms" device * various improvements to m25p80 flash devices * implement new QMP query-gic-capability command to let the management layer know what versions of GIC we support # gpg: Signature made Wed 30 Mar 2016 17:30:51 BST using RSA key ID 14360CDE # 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>" * remotes/pmaydell/tags/pull-target-arm-20160330-1: arm: implement query-gic-capabilities kvm: add kvm_device_supported() helper function arm: enhance kvm_arm_create_scratch_host_vcpu arm: qmp: add query-gic-capabilities interface block: m25p80: at25128a/at25256a models block: m25p80: n25q256a/n25q512a models block: m25p80: Implemented FSR register block: m25p80: Fast read and 4bytes commands block: m25p80: Dummy cycles for N25Q256/512 block: m25p80: Add configuration registers block: m25p80: 4byte address mode block: m25p80: Extend address mode block: m25p80: Widen flags variable block: m25p80: RESET_ENABLE and RESET_MEMORY commands block: m25p80: Removed unused variable ARM: Virt: Use gpio_key for power button hw/gpio: Add the emulation of gpio_key Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions