diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-17 07:34:34 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2014-05-17 07:34:34 +0900 |
| commit | 995f16614278cab568ed6325c398c3d7f8e7b3dd (patch) | |
| tree | 813a11b21425c03f0eb37b9461099ce6ff03b83e /tools/perf/scripts/python/net_dropmonitor.py | |
| parent | 6b262bf1dbe287ce12752da96f77c365985d6f3b (diff) | |
| parent | 3bc0c5a16d65ef2a2edb7326f5b77d6a5bcf08a5 (diff) | |
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>
Diffstat (limited to 'tools/perf/scripts/python/net_dropmonitor.py')
0 files changed, 0 insertions, 0 deletions