]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for_3.16/clk_cleanup' of git://git.kernel.org/pub/scm/linux/kernel...
authorKukjin Kim <kgene.kim@samsung.com>
Fri, 16 May 2014 22:34:34 +0000 (07:34 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Fri, 16 May 2014 22:34:34 +0000 (07:34 +0900)
commitbbe3d304a5c06340b8d1f1a31d966e1b1e0d9015
tree813a11b21425c03f0eb37b9461099ce6ff03b83e
parentb4263b1670b127c67bd378091028f46f087fc012
parentc12432e884a7e666bdf89f90864d20e9ce40459f
Merge branch 'for_3.16/clk_cleanup' of git://git.kernel.org/pub/scm/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 <mturquette@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>