From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 7 Oct 2014 09:41:48 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20141006-2' into... 
X-Git-Tag: xen-15-06-02~373
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b6011bd8a57c1eda81a857d21adeb9b66e58b1b0;p=people%2Fsstabellini%2Fqemu-dm.git%2F.git

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

linux-user pull for 2.2

Clearest linux-user patches sent to the list since august,
Apart from Mikhails patch, the rest are quite trivial.

v2: check for CONFIG_TIMERFD only after it has been defined

# gpg: Signature made Mon 06 Oct 2014 20:08:10 BST 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-20141006-2:
  translate-all.c: memory walker initial address miscalculation
  linux-user: don't include timerfd if not needed
  linux-user: Simplify timerid checks on g_posix_timers range
  linux-user: Convert blkpg to use a special subop handler
  linux-user: Enable epoll_pwait syscall for ARM

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

b6011bd8a57c1eda81a857d21adeb9b66e58b1b0