summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/clock.c
diff options
context:
space:
mode:
authorMichael Turquette2015-01-30 19:57:21 +0100
committerMichael Turquette2015-02-02 23:23:33 +0100
commitfe767560523d7556cb11fef466adf4b10141d73b (patch)
treed70e4a3b6539f21eb675adce10ad965b95ed4dfe /arch/arm/mach-omap2/clock.c
parentclk: Make clk API return per-user struct clk instances (diff)
parentARM: OMAP3: remove legacy clock data (diff)
downloadkernel-qcow2-linux-fe767560523d7556cb11fef466adf4b10141d73b.tar.gz
kernel-qcow2-linux-fe767560523d7556cb11fef466adf4b10141d73b.tar.xz
kernel-qcow2-linux-fe767560523d7556cb11fef466adf4b10141d73b.zip
Merge branch 'clk-omap-legacy' into clk-next
Conflicts: arch/arm/mach-omap2/cclock3xxx_data.c
Diffstat (limited to 'arch/arm/mach-omap2/clock.c')
0 files changed, 0 insertions, 0 deletions