| commit | fe767560523d7556cb11fef466adf4b10141d73b | [log] [tgz] |
|---|---|---|
| author | Michael Turquette <mturquette@linaro.org> | Fri Jan 30 10:57:21 2015 -0800 |
| committer | Michael Turquette <mturquette@linaro.org> | Mon Feb 02 14:23:33 2015 -0800 |
| tree | d70e4a3b6539f21eb675adce10ad965b95ed4dfe | |
| parent | 035a61c314eb3dab5bcc5683afaf4d412689858a [diff] | |
| parent | d6540b1937192271a11ee02c3d197ddc39090257 [diff] |
Merge branch 'clk-omap-legacy' into clk-next Conflicts: arch/arm/mach-omap2/cclock3xxx_data.c