diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-28 20:58:26 +0200 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-07-28 20:58:26 +0200 |
commit | 4d341056202a4725777ed99897f6456405819cd4 (patch) | |
tree | 45fb9d229bacf995aabcad282937568e5201b5a7 /drivers/w1/w1.h | |
parent | clk: h8300: Fix signness bug (diff) | |
parent | clk: ti: move low-level access and init code under clock driver (diff) | |
download | linux-4d341056202a4725777ed99897f6456405819cd4.tar.xz linux-4d341056202a4725777ed99897f6456405819cd4.zip |
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.
Diffstat (limited to 'drivers/w1/w1.h')
0 files changed, 0 insertions, 0 deletions