diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-09-24 01:32:11 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-24 01:32:11 +0100 |
| commit | eb9d0ea063fc7bdfab76b84085602a9e48d13ec7 (patch) | |
| tree | 85d1aada3b8f8e8a7966b702dfcdc5c4e3defd1d /block/nfs.c | |
| parent | fefa4b128de06cec6d513f00ee61e8208aed4a87 (diff) | |
| parent | 85b4d5dae12580ecdd446c0f71afa04a95641c91 (diff) | |
| download | qemu-eb9d0ea063fc7bdfab76b84085602a9e48d13ec7.tar.gz | |
Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150924' into staging
target-arm queue:
* support VGICv3 in KVM
* fix bug in ACPI table entries for flash devices in virt board
* update Allwinner entry in MAINTAINERS
# gpg: Signature made Thu 24 Sep 2015 01:29:55 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-20150924:
MAINTAINERS: update Allwinner A10 maintainer
hw/arm/virt-acpi-build: Fix wrong size of flash in ACPI table
hw/arm/virt: Add gic-version option to virt machine
hw/intc: Initial implementation of vGICv3
arm_kvm: Do not assume particular GIC type in kvm_arch_irqchip_create()
intc/gic: Extract some reusable vGIC code
hw/intc: Implement GIC-500 base class
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/nfs.c')
0 files changed, 0 insertions, 0 deletions