Merge commit 'f1e00a9cf326acc1f2386a72525af8859852e1df' into upstream-merge

Merge commit 'f1e00a9cf326acc1f2386a72525af8859852e1df' into upstream-merge

* commit 'f1e00a9cf326acc1f2386a72525af8859852e1df': (29 commits)
  target-i386: Update CPUID feature set for TCG
  target-alpha: Fixes for alpha-linux syscalls.
  target-alpha: Enable softfloat.
  target-alpha: Honor the -cpu command line argument.
  target-alpha: Remove bogus DO_TB_FLUSH code from translator.
  target-alpha: Add binfmt entry.
  target-alpha: Drop bogus UNIQ initial value on Linux.
  target-mips: set Config1.CA for MIPS16-aware CPUs
  target-mips: add copyright notice for mips16 work
  gdbstub: add MIPS16 support
  target-mips: add mips16 instruction decoding
  target-mips: add enums for MIPS16 opcodes
  target-mips: split out delay slot handling
  target-mips: add gen_base_offset_addr
  target-mips: make gen_compute_branch 16/32-bit-aware
  target-mips: move ROTR and ROTRV inside gen_shift_{imm, }
  target-mips: change interrupt bits to be mips16-aware
  target-mips: add new HFLAGs for JALX and 16/32-bit delay slots
  workaround for cmd646 bmdma register access while no dma is active
  s390: typo fix
  ...

Conflicts:
	target-i386/helper.c

Signed-off-by: Avi Kivity <avi@redhat.com>