projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61898bc ad1c7e0)
Merge remote-tracking branch 'remotes/riku/for-2.0' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 26 Mar 2014 17:10:15 +0000 (17:10 +0000)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 26 Mar 2014 17:10:16 +0000 (17:10 +0000)
* remotes/riku/for-2.0:
  linux-user: Correct DLINFO_ITEMS

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.