From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 26 Mar 2014 17:10:15 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/riku/for-2.0' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=db237e33c08a279f0179f8f5128a6d10d9adc38a;p=qemu.git

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>
---

db237e33c08a279f0179f8f5128a6d10d9adc38a