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

Merge branch 'develop_linux_3.14' into tizen_2.3.2

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

87c0b82ffc11650498f9f4ca800e98a4b25d150a
diff --cc package/pkginfo.manifest
index 677a89bf4ea0,b791f0da7baa..53715770b93e
--- 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.3.2-emulator-kernel-x86
  OS: ubuntu-32, ubuntu-64, windows-32, windows-64, macos-64
  Build-host-os: ubuntu-64
  Description: Tizen x86 Emulator Kernel