| commit | 3b0f4ae3e9f101ecfd918efd2a82fca0ae0b6c95 | [log] [tgz] |
|---|---|---|
| author | Michael Turquette <mturquette@baylibre.com> | Tue Mar 01 16:23:40 2016 -0800 |
| committer | Michael Turquette <mturquette@baylibre.com> | Tue Mar 01 16:23:40 2016 -0800 |
| tree | aa530b9801bd3acdb77cd10c15e6e344115acc84 | |
| parent | 811a498e5e9ab802cbd23a8ef9c844ec92450fa4 [diff] | |
| parent | 8a8b6eb7a87f12804f44128d6e4c59b19f224308 [diff] |
Merge branch 'clk-ti' into clk-next Conflicts: drivers/clk/Kconfig