From: Olof Johansson Date: Tue, 24 Dec 2013 02:57:11 +0000 (-0800) Subject: Merge tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f89bc02fe535b6f14b741df2eb268ce8eb716c31;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git Merge tag 'samsung-fixes-2' of git://git./linux/kernel/git/kgene/linux-samsung into next/fixes-non-critical From Kukjin Kim: Samsung non-critical 2nd fixes for v3.14 - Correct HSMMC1 card detection type for s3c6410-mini6410 - Fix different key mapping backslash and search key for exynos5250-snow - Fix definitions of div_mmc_pre4 divider for CLK_SET_RATE_PARENT - Fix clock provider for mshc on exynos4412 - Fix definitions of mshc dt nodes for exynos4x12 - use mshc controller for eMMC for exynos4412-trats2 * tag 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: Use MSHC controller for eMMC memory for exynos4412-trats2 ARM: dts: Fix definition of MSHC device tree nodes for exynos4x12 ARM: dts: add clock provider for mshc node for Exynos4412 SOC clk: samsung: exynos4: Fix definition of div_mmc_pre4 divider ARM: dts: Fix exynos5250-snow's search key to be L_META ARM: dts: Add the missing "\" key in non-US keyboards for exynos5250-snow ARM: S3C64XX: Correct card detect type for HSMMC1 for MINI6410 Signed-off-by: Olof Johansson --- f89bc02fe535b6f14b741df2eb268ce8eb716c31