From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Thu, 10 Sep 2015 06:46:25 +0000 (+0900)
Subject: Merge branch 'tizen_2.4_develop' into tizen_3.0_develop
X-Git-Tag: submit/tizen/20160422.055611~1^2~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a52a4cf6be54be7d265000de6660daa4d225e582;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'tizen_2.4_develop' into tizen_3.0_develop

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

Change-Id: I723188c29b751843acc06e848f6d2fa129a5e8c3
---

a52a4cf6be54be7d265000de6660daa4d225e582
diff --cc package/changelog
index f68679fdba90,14d54a15d573..60cbc0d56c2a
--- a/package/changelog
+++ b/package/changelog
@@@ -1,5 -1,9 +1,12 @@@
 -* 3.14.10
++* 3.14.11
+ - tablet: added input buffer to virtqueue
+ - VIGS: Temporary W/A for the extension
+ - tuner: separate dvb_frontend build for tv extension
+ - tablet: removed unused codes
+ - tablet: added maru tablet driver
++== SeokYeon Hwang <syeon.hwang@samsung.com> 2015-09-10
 +* 3.14.10
 +- Merge branch 'tizen_2.4_develop' into tizen_3.0_develop
  == Sooyoung Ha <yoosah.ha@samsung.com> 2015-08-19
  * 3.14.9
  - not build security partially when extension supported
diff --cc package/pkginfo.manifest
index 0be5188e83f2,870da33ebafc..bfc8eb626d9f
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,8 -1,8 +1,8 @@@
  Source: emulator-kernel
--Version: 3.14.10
++Version: 3.14.11
  Maintainer: SeokYeon Hwang <syeon.hwang@samsung.com>
  
 -Package: 2.4-emulator-kernel-x86
 +Package: 3.0-emulator-kernel-x86
  OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
  Build-host-os: ubuntu-32
  Description: Tizen x86 Emulator Kernel