Merge branch 'for_3.16/clk_cleanup' of git://git.kernel.org/pub/scm/linux/kernel...

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 <[email protected]>
Signed-off-by: Kukjin Kim <[email protected]>