Merge branch 'x86cpu_qom_tcg_v2' of git://github.com/imammedo/qemu