From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 15 Jul 2014 15:49:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/riku/linux-user-for-upstream' into staging
X-Git-Tag: qemu-xen-4.6.0-rc1~305
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=cbb46f5f49d4a9cc5ce1a2f43a749003c71bbeb4;p=qemu-upstream-4.6-testing.git

Merge remote-tracking branch 'remotes/riku/linux-user-for-upstream' into staging

* remotes/riku/linux-user-for-upstream:
  linux-user: use TARGET_SA_ONSTACK in get_sigframe
  alloca one extra byte sockets
  linux-user: handle AF_PACKET sockaddrs in target_to_host_sockaddr
  qemu-user: Impl. setsockopt(SO_BINDTODEVICE)
  SIOCGIFINDEX: fix typo

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

cbb46f5f49d4a9cc5ce1a2f43a749003c71bbeb4