| commit | 1d9438f7b560862fd0832355b4ad199b30e67478 | [log] [tgz] |
|---|---|---|
| author | Mike Turquette <mturquette@linaro.org> | Sun Dec 01 12:42:45 2013 -0800 |
| committer | Mike Turquette <mturquette@linaro.org> | Sun Dec 01 12:42:45 2013 -0800 |
| tree | 483dd72ab0064cf9690d4371056c2ed801220709 | |
| parent | 4d04391cfe6446fb2f184d063b56a4dcce425334 [diff] | |
| parent | e71c69fc3362b88b09194d486dda6d721a8004f6 [diff] |
Merge tag 'sunxi-clk-for-3.13' of https://github.com/mripard/linux into clk-next-sunxi-rebase Allwinner sunXi SoCs clock changes Those are mostly random fixes, except for one patch to the composite clock that adds support for automatic reparenting. Conflicts: drivers/clk/sunxi/clk-sunxi.c