]> xenbits.xensource.com Git - qemu-upstream-4.6-testing.git/commitdiff
Merge remote-tracking branch 'remotes/riku/linux-user-for-upstream' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 15 Jul 2014 15:49:28 +0000 (16:49 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 15 Jul 2014 15:49:28 +0000 (16:49 +0100)
* 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>

Trivial merge