Merge branch 'develop_linux_3.14' into tizen_2.3.2

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

diff --cc package/changelog
Simple merge

diff --cc package/pkginfo.manifest
index 677a89bf4ea09f2005549bffe023db872a4fe793,b791f0da7baadc4b2407a2a922a9ce8cba0157eb..53715770b93e006c08ba374fe05534eb33b0e268
--- 1/package/pkginfo.manifest
--- 2/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