summaryrefslogtreecommitdiff
path: root/drivers/iio
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2015-07-28 21:58:26 +0300
committerStephen Boyd <sboyd@codeaurora.org>2015-07-28 21:58:26 +0300
commit4d341056202a4725777ed99897f6456405819cd4 (patch)
tree45fb9d229bacf995aabcad282937568e5201b5a7 /drivers/iio
parente306479ac252928b84cc563c6e790f9b7e7ae427 (diff)
parent989feafb84118a840ff21250a1e5f516f43e3dbb (diff)
downloadlinux-4d341056202a4725777ed99897f6456405819cd4.tar.xz
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/iio')
0 files changed, 0 insertions, 0 deletions