diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-26 17:10:15 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-26 17:10:16 +0000 |
| commit | db237e33c08a279f0179f8f5128a6d10d9adc38a (patch) | |
| tree | b30b3231ed07a78cbca3cdc977ad82d944e28263 /include/qemu-common.h | |
| parent | 61898bc020c3367c629a99a2abdaa1c60fce76cd (diff) | |
| parent | ad1c7e0faac82eeb654cba7f99d4e6d88273e0f9 (diff) | |
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 'include/qemu-common.h')
0 files changed, 0 insertions, 0 deletions