tree 72eb62402bcda7c89bae83b92f2b4f8f5bd19b5b
parent 146ae00192ffcbd78f6b11fa78c72d1b3d628d8a
parent b545f63fa974ebffd55d70ca615572d497e543dc
author Peter Maydell <peter.maydell@linaro.org> 1405439368 +0100
committer Peter Maydell <peter.maydell@linaro.org> 1405439368 +0100

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>