diff options
author | Peter Maydell | 2014-03-26 18:10:15 +0100 |
---|---|---|
committer | Peter Maydell | 2014-03-26 18:10:16 +0100 |
commit | db237e33c08a279f0179f8f5128a6d10d9adc38a (patch) | |
tree | b30b3231ed07a78cbca3cdc977ad82d944e28263 /hw/arm | |
parent | Merge remote-tracking branch 'remotes/bonzini/scsi-next' into staging (diff) | |
parent | linux-user: Correct DLINFO_ITEMS (diff) | |
download | qemu-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