Merge branch 'develop_linux_3.14' into tizen_studio_1.1_p2.3.2

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

diff --cc package/build.linux
index 71b6cf154af1511050e5255cbfab85e3a2e6fb04,d3418ee076184633b53da2be156e29d6c1991da2..c2fabf10c8aa3a5bf065ef9000853ef601a560ee
--- 1/package/build.linux
--- 2/package/build.linux
+++ b/package/build.linux
@@@ -27,9 -27,9 +27,9 @@@ build(
  # install
  install()
  {
 -      KERNEL_DIR=$SRCDIR/package/2.4-emulator-kernel-x86.package.${TARGET_OS}/data/platforms/tizen-2.4/common/emulator/data/kernel
 +      KERNEL_DIR=$SRCDIR/package/2.3.2-emulator-kernel-x86.package.${TARGET_OS}/data/platforms/tizen-2.3.2/common/emulator/data/kernel
        mkdir -p $KERNEL_DIR
  
-       cp ./bzImage.i386 $KERNEL_DIR/bzImage.i386
-       cp ./bzImage.x86_64 $KERNEL_DIR/bzImage.x86_64
+       cp ./bzImage.x86 $KERNEL_DIR/
+       cp ./bzImage.x86_64 $KERNEL_DIR/
  }

diff --cc package/pkginfo.manifest
index a237267358568d10a15d433d969b25566b910f0d,9c0a6b37b675fbdf4c822f837414a1aec0c78f34..4e29414d7fb8b17a32a0371c7905bd59a464a7d1
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,8 -1,8 +1,8 @@@
  Source: emulator-kernel
- Version: 3.14.25
+ Version: 3.14.26
  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