From: Sooyoung Ha <yoosah.ha@samsung.com>
Date: Tue, 12 Jul 2016 11:10:55 +0000 (+0900)
Subject: Merge branch 'develop_linux_3.14' into platform_2.3.2
X-Git-Tag: TizenStudio_2.0_p2.3.2~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b3064f0001b601785aac4b6bd9f7edc33afd8bef;p=sdk%2Femulator%2Femulator-kernel.git

Merge branch 'develop_linux_3.14' into platform_2.3.2

Change-Id: Ibd9eddda3f52ec401f403ab517fe93e09a479d12
Signed-off-by: Sooyoung Ha <yoosah.ha@samsung.com>
---

b3064f0001b601785aac4b6bd9f7edc33afd8bef
diff --cc package/pkginfo.manifest
index 53715770b93e,871797d96dee..eac077139475
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,8 -1,8 +1,8 @@@
  Source: emulator-kernel
- Version: 3.14.21
+ Version: 3.14.22
  Maintainer: SeokYeon Hwang <syeon.hwang@samsung.com>
  
 -Package: 2.4-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