From: Edgar E. Iglesias <edgar@axis.com>
Date: Sat, 4 Dec 2010 03:18:28 +0000 (+0100)
Subject: Merge branch 'linux-user-for-upstream' of git://gitorious.org/qemu-maemo/qemu
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bcd478781ab1d11911ab5505c34b5577de904eeb;p=qemu-xen-4.1-testing.git

Merge branch 'linux-user-for-upstream' of git://gitorious.org/qemu-maemo/qemu

* 'linux-user-for-upstream' of git://gitorious.org/qemu-maemo/qemu:
  linux-user: fix mips and ppc to use UID16
  update binfmt conf
  linux-user: fix compiler error on nptl
  ARM: linux-user: Restore iWMMXT state from ucontext on sigreturn
  ARM: linux-user: Expose iWMMXT registers to signal handlers
  ARM: linux-user: Restore VFP state from ucontext on sigreturn
  ARM: linux-user: Expose VFP registers to signal handlers
  ARM: Expose vfp_get_fpscr() and vfp_set_fpscr() to C code
  ARM: linux-user: Correct size of padding in target_ucontext_v2
  target-sparc: remove unused functions cpu_lock(), cpu_unlock()
  ARM: enable XScale/iWMMXT in linux-user mode
  linux-user: Translate getsockopt level option
  linux-user: remove unnecessary local from __get_user(), __put_user()
  linux-user: fix memory leaks with NPTL emulation
  linux-user: mmap_reserve() not controlled by RESERVED_VA
  [PATCH] target-arm: remove unused functions cpu_lock(), cpu_unlock()
---

bcd478781ab1d11911ab5505c34b5577de904eeb