]> git.proxmox.com Git - mirror_qemu.git/commit
Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging
authorAnthony Liguori <aliguori@amazon.com>
Fri, 6 Dec 2013 20:56:51 +0000 (12:56 -0800)
committerAnthony Liguori <aliguori@amazon.com>
Fri, 6 Dec 2013 20:56:51 +0000 (12:56 -0800)
commita55d121f4a932dcd19eb8164804cc98d5ea88e72
tree45527567a6630058b1d4daf05fa738b9280b7945
parente679f05248e220b8ef587e8fd6c64ffe83b1e16f
parenta29267846a52b4ca294ba3a962b74b67df7ce6d2
Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging

# By Erik de Castro Lopo (2) and others
# Via Riku Voipio
* riku/linux-user-for-upstream:
  linux-user: pass correct parameter to do_shmctl()
  linux-user: create target_structs header to place ipc_perm and shmid_ds
  flatload: fix non-GOT relocations
  linux-user: Implement handling of 5 POSIX timer syscalls.
  linux-user: Add target struct defs needed for POSIX timer syscalls.

Message-id: cover.1385732338.git.riku.voipio@linaro.org
Signed-off-by: Anthony Liguori <aliguori@amazon.com>