diff options
| author | Michael Turquette <mturquette@linaro.org> | 2015-06-03 15:22:03 -0700 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2015-06-03 15:22:03 -0700 |
| commit | ae8d4048fada71a77144e0f05e8612f90b9501f0 (patch) | |
| tree | d911226fa3a204d139cbc136e7d1bb1bba4711b3 /include/dt-bindings/clock/marvell,pxa168.h | |
| parent | 19fbbbbcd3a3a8e307a4768784166abf7b55b779 (diff) | |
| parent | 72ea48610d43c59507d9ad39083d40085400ba12 (diff) | |
Merge branch 'clk-next-hi6220' into clk-next
Conflicts:
drivers/clk/Kconfig
Diffstat (limited to 'include/dt-bindings/clock/marvell,pxa168.h')
0 files changed, 0 insertions, 0 deletions