Merge branch 'tizen_qemu_1.5.1' into develop

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Conflicts:
	console.h
	hw/ps2.c
	input.c

diff --cc .gitignore
Simple merge

diff --cc tizen/src/Makefile
Simple merge

diff --cc tizen/src/emulator.c
Simple merge

diff --cc tizen/src/hw/maru_codec.c
Simple merge

diff --cc tizen/src/skin/maruskin_server.c
Simple merge