From: Olof Johansson Date: Fri, 3 Apr 2015 21:51:10 +0000 (-0700) Subject: Merge tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=03a1e74cad817a381b4789fb9cc39c47c263c8a8;p=linux-beck.git Merge tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes Merge "Samsung 2nd fixes for v4.0" from Kukjin Kim: - Fix build breakage exynos cpuidle driver on !SMP because it is coupled built-in so added check for SMP. - Fix lid, power pin-functions and mmc node updates for exynos5250-spring: Fixes commit ID 53dd4138bb0a ("ARM: dts: Add exynos5250-spring device tree") * tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: EXYNOS: Fix build breakage cpuidle on !SMP ARM: dts: fix lid and power pin-functions for exynos5250-spring ARM: dts: fix mmc node updates for exynos5250-spring Signed-off-by: Olof Johansson --- 03a1e74cad817a381b4789fb9cc39c47c263c8a8