aboutsummaryrefslogtreecommitdiff
path: root/monitor.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-11-11 10:09:31 +0000
committerPeter Maydell <peter.maydell@linaro.org>2014-11-11 10:09:31 +0000
commit59c4f2ecefe33878bc23219a51d0bd913d46aa97 (patch)
tree96ff4c0a23e31a642bc3f483d1cdf83ed1763279 /monitor.c
parent9df98352b700bdf31ee18cd956393a07f427d829 (diff)
parentaecc88616a64a4e0a1ae0d6986de0054ea9f37d2 (diff)
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>
Diffstat (limited to 'monitor.c')
0 files changed, 0 insertions, 0 deletions