]> 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)
commit6a7a0dcc6c7dee84ae02798b0cde8b734d88bf2b
treed70e4a3b6539f21eb675adce10ad965b95ed4dfe
parent489627254d66b4a46c126ee5432375467d7cf9fc
parent1578340ec10973fad01aa83abb01f499a1bbf6ac
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