From: Anthony Liguori Date: Fri, 6 Dec 2013 20:56:51 +0000 (-0800) Subject: Merge remote-tracking branch 'riku/linux-user-for-upstream' into staging X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a55d121f4a932dcd19eb8164804cc98d5ea88e72;p=qmiga%2Fqemu.git 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 --- a55d121f4a932dcd19eb8164804cc98d5ea88e72