linux-next: manual merge of the samsung tree with Linus' tree

Hi Kukjin, Today's linux-next merge of the samsung tree got a conflict in arch/arm/mach-exynos/sleep.S between commit 25a9ef63cd2b ("ARM: l2c: exynos: convert to common l2c310 early resume functionality") from Linus' tree and commit af728bd84cc8 ("ARM: EXYNOS: Fix build error with thumb2") from th

linux-next: manual merge of the samsung tree with Linus' tree

Hi Kukjin, Today's linux-next merge of the samsung tree got a conflict in drivers/clk/samsung/clk-exynos5250.c between commit 39b72d89eb2b ("clk: exynos5250: Update cpufreq related clocks for EXYNOS5250") from Linus' tree and commit 407e8d62fa7d ("clk: exynos5250: Staticize local symbols") from th