]> git.baikalelectronics.ru Git - kernel.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)
commit9f31a3ec2a5752bfb4ef1f718d5ae7145025f8cc
tree45fb9d229bacf995aabcad282937568e5201b5a7
parentebd518538d7ab3567eaa4f5e08dcc710c473a781
parent52e5ed4c6318840b5c6857a2ae54b61d98acf392
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