diff options
author | Michael Turquette <mturquette@linaro.org> | 2015-01-30 19:57:21 +0100 |
---|---|---|
committer | Michael Turquette <mturquette@linaro.org> | 2015-02-02 23:23:33 +0100 |
commit | fe767560523d7556cb11fef466adf4b10141d73b (patch) | |
tree | d70e4a3b6539f21eb675adce10ad965b95ed4dfe /scripts/depmod.sh | |
parent | clk: Make clk API return per-user struct clk instances (diff) | |
parent | ARM: OMAP3: remove legacy clock data (diff) | |
download | linux-fe767560523d7556cb11fef466adf4b10141d73b.tar.xz linux-fe767560523d7556cb11fef466adf4b10141d73b.zip |
Merge branch 'clk-omap-legacy' into clk-next
Conflicts:
arch/arm/mach-omap2/cclock3xxx_data.c
Diffstat (limited to 'scripts/depmod.sh')
0 files changed, 0 insertions, 0 deletions