summaryrefslogtreecommitdiffstats
path: root/hw/arm
diff options
context:
space:
mode:
authorPeter Maydell2014-03-26 18:10:15 +0100
committerPeter Maydell2014-03-26 18:10:16 +0100
commitdb237e33c08a279f0179f8f5128a6d10d9adc38a (patch)
treeb30b3231ed07a78cbca3cdc977ad82d944e28263 /hw/arm
parentMerge remote-tracking branch 'remotes/bonzini/scsi-next' into staging (diff)
parentlinux-user: Correct DLINFO_ITEMS (diff)
downloadqemu-db237e33c08a279f0179f8f5128a6d10d9adc38a.tar.gz
qemu-db237e33c08a279f0179f8f5128a6d10d9adc38a.tar.xz
qemu-db237e33c08a279f0179f8f5128a6d10d9adc38a.zip
Merge remote-tracking branch 'remotes/riku/for-2.0' into staging
* remotes/riku/for-2.0: linux-user: Correct DLINFO_ITEMS Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/arm')
0 files changed, 0 insertions, 0 deletions