tree 569d71f4e7fa68316f037486f83b204eae31abed
parent 0bc8ce9460c1f51211e797a825432e55327b70c6
parent c07ecc6866f8c5eb2e0b23ba20214000310355e0
author Anthony Liguori <aliguori@us.ibm.com> 1360190344 -0600
committer Anthony Liguori <aliguori@us.ibm.com> 1360190344 -0600

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 <aliguori@us.ibm.com>