Merge commit '6049f4f831c6f409031dfa09282b38d0cbaecad8' into upstream-merge
commite19ec919797ecf047ec805662850311b6a5298ee
authorMarcelo Tosatti <mtosatti@redhat.com>
Thu, 4 Mar 2010 19:41:35 +0000 (4 16:41 -0300)
committerMarcelo Tosatti <mtosatti@redhat.com>
Thu, 4 Mar 2010 19:41:35 +0000 (4 16:41 -0300)
treee4fb3679ef2fd8f6e85141d60c050e4f960881f0
parentca8773d10fa15cd00a754faa7f26091b81587df3
parent6049f4f831c6f409031dfa09282b38d0cbaecad8
Merge commit '6049f4f831c6f409031dfa09282b38d0cbaecad8' into upstream-merge

* commit '6049f4f831c6f409031dfa09282b38d0cbaecad8': (32 commits)
  alpha-linux-user: Implement signals.
  target-alpha: Implement IEEE FP qualifiers.
  target-ppc: don't print invalid opcode messages on the console
  Revert "target-ppc: stop translation after a trap instruction"
  audio/alsa: Handle SND_PCM_STATE_SETUP in alsa_poll_handler
  audio/alsa: Spelling typo (paramters)
  target-ppc: stop translation after a trap instruction
  qemu-char.c: drop debug printfs from qemu_chr_parse_compat
  powerpc/e500: adjust fdt and ramdisk loading addr
  powerpc: fix compilation with CONFIG_FDT undefined
  powerpc/booke: move fdt loading to rom infrastructure
  target-ppc: add synchronize register for booke init
  target-sh4: Fix gdb read/write register
  target-ppc: fix SPE evsplat* instructions
  target-ppc: fix SPE evcmp* instructions
  arm host: Fix linker warning (m68k targets)
  Fix 'make install' from non-srcdir build
  Fix to 'gdb detach' stub
  Fix qemu -net user,hostfwd= example
  tcg/ppc: Fix right rotation
  ...

Conflicts:
Makefile.target

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Makefile
Makefile.target
gdbstub.c
hw/ppc440_bamboo.c
hw/ppce500_mpc8544ds.c
kvm.h
qemu-options.hx
target-i386/helper.c
target-ppc/cpu.h