From: Anthony Liguori Date: Wed, 6 Feb 2013 22:39:04 +0000 (-0600) Subject: Merge branch 'for-linux-user' of https://git.gitorious.org/qemu-m68k/qemu-m68k into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bd4bd24ed3e33f4f0ffa9dde23b8b85430592dc6;p=qemu.git Merge branch 'for-linux-user' of https://git.gitorious.org/qemu-m68k/qemu-m68k into staging * 'for-linux-user' of https://git.gitorious.org/qemu-m68k/qemu-m68k: linux-user: correct reboot() linux-user: correct setsockopt() linux-user: correct print_timeval() swap tv_sec and tv_usec linux-user: correct msgrcv() Signed-off-by: Anthony Liguori --- bd4bd24ed3e33f4f0ffa9dde23b8b85430592dc6