Merge branch 'x86cpu_qom_tcg_v2' of git://github.com/imammedo/qemu
authorBlue Swirl <blauwirbel@gmail.com>
Thu, 9 Aug 2012 18:44:49 +0000 (18:44 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Thu, 9 Aug 2012 18:44:49 +0000 (18:44 +0000)
* 'x86cpu_qom_tcg_v2' of git://github.com/imammedo/qemu:
  target-i386: move tcg initialization into x86_cpu_initfn()
  cleanup cpu_set_debug_excp_handler
  target-xtensa: drop usage of prev_debug_excp_handler
  target-i386: drop usage of prev_debug_excp_handler

1  2 
cpu-exec.c
target-i386/cpu.c
target-i386/cpu.h
target-i386/helper.c

diff --cc cpu-exec.c
Simple merge
Simple merge
Simple merge
Simple merge