From: Kitae Kim Date: Tue, 16 Jul 2013 06:41:27 +0000 (+0900) Subject: Merge branch 'tizen_qemu_1.5.1' into develop X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a5d958ec3810cb5678a7800c229f421339029c2d;p=sdk%2Femulator%2Femulator-kernel.git 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 --- a5d958ec3810cb5678a7800c229f421339029c2d diff --cc include/linux/virtio_ids.h index c185ffbb460f,b2f851475a79..b2f851475a79 mode 100755,100644..100755 --- a/include/linux/virtio_ids.h +++ b/include/linux/virtio_ids.h diff --cc package/changelog index bd271aaab4d3,b87bca54c9f9..c6e827d5e8ba --- a/package/changelog +++ b/package/changelog @@@ -36,18 -40,18 +36,18 @@@ - Modified touchscreen range == GiWoong Kim 2012-11-27 * 1.4.3 -- Removed an invalid symbolic-link in init script -- touchscreen0, keyboard0, smotion node -== GiWoong Kim 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 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 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 2012-10-23 -* 1.4.0 -- Merge develop into release branch. -- Some features or bug fixes are merged from develop. -== Kitae Kim 2012-11-02 +== GiWoong.kim 2012-11-05 - 1.3.24 + * 1.3.24 - The range of brightness level has been changed.(1 ~ 24 => 0 ~ 100) == Jinhyung.jo 2012-10-31 * 1.3.23