summaryrefslogtreecommitdiffstats
path: root/drivers/rtc/rtc-sa1100.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-19 18:17:32 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-19 18:17:32 +0100
commit4992fa1fd425f1934f503ffa96b68e235b89db9a (patch)
tree4710bcfe3eddc876c8243ff8fd8b5bca13946168 /drivers/rtc/rtc-sa1100.c
parentMerge remote-tracking branch 'regulator/topic/supply' into regulator-next (diff)
parentmfd: twl-core: regulator configuration for twl6030 V1V8, V2V1 SMPS (diff)
downloadlinux-4992fa1fd425f1934f503ffa96b68e235b89db9a.tar.xz
linux-4992fa1fd425f1934f503ffa96b68e235b89db9a.zip
Merge tag 'topic/twl' into regulator-next
TWL specific changes, cross-merged with OMAP due to arch/arm wanting to use the new ability to override the voltage set and get operations to support the in-CPU voltage management. The other changes are minor fixes, the addition of a few new regulators and device tree support.
Diffstat (limited to 'drivers/rtc/rtc-sa1100.c')
0 files changed, 0 insertions, 0 deletions