]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'for-4.2/ti-clk-move' of https://github.com/t-kristo/linux-pm into clk...
authorStephen Boyd <sboyd@codeaurora.org>
Tue, 28 Jul 2015 18:58:26 +0000 (11:58 -0700)
committerStephen Boyd <sboyd@codeaurora.org>
Tue, 28 Jul 2015 18:58:26 +0000 (11:58 -0700)
commit4d341056202a4725777ed99897f6456405819cd4
tree45fb9d229bacf995aabcad282937568e5201b5a7
parente306479ac252928b84cc563c6e790f9b7e7ae427
parent989feafb84118a840ff21250a1e5f516f43e3dbb
Merge branch 'for-4.2/ti-clk-move' of https://github.com/t-kristo/linux-pm into clk-next

From Tero Kristo:
  "This pull request contains the TI clock driver set to move the
   clock implementations under clock driver. Some small portions of
   the clock driver code still remain under mach-omap2 after this,
   it should be decided whether this code is now obsolete and should
   be deleted or should someone try to fix it."

Slight merge conflicts with determine_rate prototype changes.
arch/arm/mach-omap2/Makefile
drivers/clk/ti/clk-7xx.c
drivers/clk/ti/clk.c
drivers/clk/ti/clock.h
drivers/clk/ti/clockdomain.c
drivers/clk/ti/dpll3xxx.c
drivers/clk/ti/dpll44xx.c