]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'clk-omap-legacy' into clk-next
authorMichael Turquette <mturquette@linaro.org>
Fri, 30 Jan 2015 18:57:21 +0000 (10:57 -0800)
committerMichael Turquette <mturquette@linaro.org>
Mon, 2 Feb 2015 22:23:33 +0000 (14:23 -0800)
commitaaf74dc6ce64f82da753aeb9e904a1812badb4e9
treed70e4a3b6539f21eb675adce10ad965b95ed4dfe
parent087fa58ec1537564dbbb70828ee942a25400d21e
parent356ec5b182649cc37e996f05f1e91f4565bea57d
Merge branch 'clk-omap-legacy' into clk-next

Conflicts:
arch/arm/mach-omap2/cclock3xxx_data.c
drivers/clk/ti/Makefile
include/linux/clk/ti.h