tree 970fbd4452ef9c28a9f039ca71b353c69f706e75
parent 92fc4b586f8856ee9f2bad31fb6e9acd80fa8319
parent 3a1363acf9648bc26989b01b87c7c3c494df2138
author Blue Swirl <blauwirbel@gmail.com> 1344973822 +0000
committer Blue Swirl <blauwirbel@gmail.com> 1344973822 +0000

Merge branch 'linux-user.next' of git://git.linaro.org/people/pmaydell/qemu-arm

* 'linux-user.next' of git://git.linaro.org/people/pmaydell/qemu-arm:
  linux-user: ARM: Ignore immediate value for svc in thumb mode
  linux-user: Use init_guest_space when -R and -B are specified
  linux-user: Factor out guest space probing into a function
  flatload: fix bss clearing
  linux-user: make host_to_target_cmsg support SO_TIMESTAMP cmsg_type
  linux-user: make do_setsockopt support SOL_RAW ICMP_FILTER socket option
  linux-user: pass sockaddr from host to target
  linux-user: Move target_to_host_errno_table[] setup out of ioctl loop
  linux-user: Fix SNDCTL_DSP_MAP{IN, OUT}BUF ioctl definitions
  linux-user: Fix incorrect TARGET_BLKBSZGET, TARGET_BLKBSZSET