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

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

diff --cc package/changelog
index f68679fdba90e4896e34b2069231d734bef0b427,14d54a15d5733d7ffc0ba85879610c0fe6ac71ba..60cbc0d56c2a828dc55dbb0ef5f691dc2b7aefec
--- 1/package/changelog
--- 2/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 0be5188e83f25f449c4cf3953e89f2648064efd3,870da33ebafc158374f922492ac2514416b0f41e..bfc8eb626d9f22a175d9feadfea7f714e733bc1b
--- 1/package/pkginfo.manifest
--- 2/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