Merge branch 'tizen_qemu_1.5.1' into develop

Conflicts:
	drivers/maru/Kconfig
	drivers/maru/Makefile
	drivers/maru/maru_virtio_touchscreen.c
	include/linux/virtio_ids.h
	package/changelog

Signed-off-by: Kitae Kim <kt920.kim@samsung.com>

diff --cc drivers/maru/maru_virtio_touchscreen.c
Simple merge

diff --cc include/linux/virtio_ids.h
index c185ffbb460fa685b9b9c2187a839e8b2b2a7334,b2f851475a796b4f697c733a1239ea02f362d570..b2f851475a796b4f697c733a1239ea02f362d570
mode 100755,100644..100755
--- 1/include/linux/virtio_ids.h
--- 2/include/linux/virtio_ids.h
+++ b/include/linux/virtio_ids.h

diff --cc package/changelog
index bd271aaab4d34ea4038702aa4a5eff52bf78c7fa,b87bca54c9f917d4ee2e28ee73b7277b968d15d0..c6e827d5e8bafa4eb7d0512d06b0d131e4deea7b
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -36,18 -40,18 +36,18 @@@
  - Modified touchscreen range
  == GiWoong Kim <giwoong.kim@samsung.com> 2012-11-27
  * 1.4.3
 -- Removed an invalid symbolic-link in init script
 -- touchscreen0, keyboard0, smotion node
 -== GiWoong Kim <giwoong.kim@samsung.com> 2012-11-12
 +- fixed a bug when virtio-keyboard is removed.
 +- input_free_device function cannot be used after calling input_unregister_device function.
 +== Kita Kim <kt920.kim@samsung.com> 2012-11-13
  * 1.4.2
 -- Do not ignore a touch event on emulator
 +- enable virtio-pci, virtio-touchscreen, net-9p, 9pfs drivers for arm kernel.
 +- Those drivers are necessary for host fileshare feature and virtio-touchscreen-pci device on arm emulator.
 +== Kita Kim <kt920.kim@samsung.com> 2012-11-09
 +* 1.4.1
 +- Do not ignore a touch event on emulator.
  - The current touch event may be same as the previous coordinate data.
 -== GiWoong Kim <giwoong.kim@samsung.com> 2012-10-23
 -* 1.4.0
 -- Merge develop into release branch.
 -- Some features or bug fixes are merged from develop.
 -== Kitae Kim <kt920.kim@samsung.com> 2012-11-02
 +== GiWoong.kim <giwoong.kim@samsung.com> 2012-11-05
-  1.3.24
+ * 1.3.24
  - The range of brightness level has been changed.(1 ~ 24 => 0 ~ 100)
  == Jinhyung.jo <jinhyung.jo@samsung.com> 2012-10-31
  * 1.3.23