diff options
author | Mike Turquette <mturquette@linaro.org> | 2013-08-28 03:07:46 +0200 |
---|---|---|
committer | Mike Turquette <mturquette@linaro.org> | 2013-08-28 03:07:46 +0200 |
commit | c045ddeb3893c4614e6ab694b8d297e3badc23af (patch) | |
tree | 6e13aa83c08809b9d082511b43270da8d11551e5 /drivers/rtc/rtc-ds1286.c | |
parent | clk: wrap I/O access for improved portability (diff) | |
parent | clk: sunxi: Add Allwinner A20 gates (diff) | |
download | linux-c045ddeb3893c4614e6ab694b8d297e3badc23af.tar.xz linux-c045ddeb3893c4614e6ab694b8d297e3badc23af.zip |
Merge tag 'sunxi-clk-for-3.12' of https://github.com/mripard/linux into clk-next-sunxi
Allwinner clock changes for 3.12
These patches mostly do some cleanup to introduce the basic gated clocks for
the Allwinner A10s, A20 and A31 SoCs.
Conflicts:
drivers/clk/sunxi/clk-sunxi.c
Diffstat (limited to 'drivers/rtc/rtc-ds1286.c')
0 files changed, 0 insertions, 0 deletions