From: Stephen Boyd Date: Tue, 28 Jul 2015 18:58:26 +0000 (-0700) Subject: Merge branch 'for-4.2/ti-clk-move' of https://github.com/t-kristo/linux-pm into clk... X-Git-Tag: omap-for-v4.3/fixes-merge-window~30^2~98 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d341056202a4725777ed99897f6456405819cd4;p=pandora-kernel.git 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. --- 4d341056202a4725777ed99897f6456405819cd4 Reading git-diff-tree failed