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)
commitdb237e33c08a279f0179f8f5128a6d10d9adc38a
treeb30b3231ed07a78cbca3cdc977ad82d944e28263
parent61898bc020c3367c629a99a2abdaa1c60fce76cd
parentad1c7e0faac82eeb654cba7f99d4e6d88273e0f9
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>