From: Kukjin Kim Date: Fri, 16 May 2014 22:34:34 +0000 (+0900) Subject: Merge branch 'for_3.16/clk_cleanup' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: firefly_0821_release~176^2~3465^2~47^2~4^2~5 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=995f16614278cab568ed6325c398c3d7f8e7b3dd;p=firefly-linux-kernel-4.4.55.git Merge branch 'for_3.16/clk_cleanup' of git://git./linux/kernel/git/tfiga/samsung-clk into v3.16-next/clk-samsung Pull Samsung clock cleanup from Tomasz Figa: "This pull requests contains minor clean-up related to Samsung clock support, including: 1) move Kconfig entries of Samsung clock drivers to drivers/clk, 2) compile drivers/clk/samsung conditionally when COMMON_CLK_SAMSUNG is selected, 3) remove obsolete Kconfig lines after moving s3c24xx to CCF." Conflicts: arch/arm/mach-s3c24xx/Kconfig Acked-by: Mike Turquette Signed-off-by: Kukjin Kim --- 995f16614278cab568ed6325c398c3d7f8e7b3dd