Merge branch 'devel/tizen' into tizen

Change-Id: I2ad8d2316675bdcdf736e166a670b81183ae64bb

diff --cc packaging/xf86-video-exynos.spec
index 72eecd5,f816cbb..4a4a0ae
--- 1/packaging/xf86-video-exynos.spec
--- 2/packaging/xf86-video-exynos.spec
+++ b/packaging/xf86-video-exynos.spec
@@@ -40,7 -35,7 +39,7 @@@ This package provides the driver for th
  rm -rf %{buildroot}
  
  %autogen --disable-static \
-       CFLAGS="${CFLAGS} -Wall -Werror -mfpu=neon -mfloat-abi=softfp" LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed"
 -      CFLAGS="${CFLAGS} -Wall -mfpu=neon -DNO_CRTC_MODE -mfloat-abi=softfp" LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed"
++      CFLAGS="${CFLAGS} -Wall -Werror -mfpu=neon -DNO_CRTC_MODE -mfloat-abi=softfp" LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed"
  
  
  make %{?jobs:-j%jobs}