From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Tue, 28 Jun 2016 02:15:01 +0000 (+0900)
Subject: Merge branch 'develop_linux_3.14' into platform_2.4
X-Git-Tag: TizenStudio_2.0_p2.4~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=12cfdc9d7fedf50b708e2d1bcf4e44bd05c1af38;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'develop_linux_3.14' into platform_2.4

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

12cfdc9d7fedf50b708e2d1bcf4e44bd05c1af38
diff --cc package/pkginfo.manifest
index bcfab4d34164,b791f0da7baa..48f5fd64634f
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,8 -1,8 +1,8 @@@
  Source: emulator-kernel
- Version: 3.14.20
+ Version: 3.14.21
  Maintainer: SeokYeon Hwang <syeon.hwang@samsung.com>
  
 -Package: 3.0-emulator-kernel-x86
 +Package: 2.4-emulator-kernel-x86
  OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
  Build-host-os: ubuntu-64
  Description: Tizen x86 Emulator Kernel