qemu1.5.1: remove conflicts to merge
authorsungmin ha <sungmin82.ha@samsung.com>
Tue, 2 Jul 2013 10:48:24 +0000 (19:48 +0900)
committersungmin ha <sungmin82.ha@samsung.com>
Tue, 2 Jul 2013 10:48:24 +0000 (19:48 +0900)
commitfa1d08ab733e507677fda8971658213ae7f4a315
treeeb10683b84bee661d003868d61b1f585b6b833ec
parent6d7ee3e0d990b38cfe087fe1a179fda8d4b5e289
qemu1.5.1: remove conflicts to merge

Signed-off-by: Sungmin Ha <sungmin82.ha@samsung.com>
blockdev.c
default-configs/arm-softmmu.mak
hw/9pfs/virtio-9p-device.c
hw/arm/Makefile.objs
os-win32.c
tcg/i386/tcg-target.c
tcg/tcg.c
tcg/tcg.h