From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 11 Nov 2014 10:09:31 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20141111' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=59c4f2ecefe33878bc23219a51d0bd913d46aa97;p=qemu.git

Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20141111' into staging

linux-user pull for 2.2

Two last minute fixes uncovered and fixed by Tom Musta
and Alexander Graf, thanks

# gpg: Signature made Tue 11 Nov 2014 06:36:02 GMT using RSA key ID DE3C9BC0
# gpg: Good signature from "Riku Voipio <riku.voipio@iki.fi>"
# gpg:                 aka "Riku Voipio <riku.voipio@linaro.org>"

* remotes/riku/tags/pull-linux-user-20141111:
  linux-user: Fix up timer id handling
  linux-user: Do not subtract offset from end address

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

59c4f2ecefe33878bc23219a51d0bd913d46aa97