diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-22 01:19:24 +0300 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-22 01:19:24 +0300 |
| commit | b735a1872c83db608aae7b3ef376b61f5d7de24c (patch) | |
| tree | efe3489a84d37da949069fe72d4e36e2b8976dba /drivers/clk/at91/clk-programmable.c | |
| parent | 0fdf6766312c360e76210eb633e9919ed2390819 (diff) | |
| parent | ece3b3864848fa1a38c10078559c951886a2c1ea (diff) | |
| download | linux-linaro-tracking-b735a1872c83db608aae7b3ef376b61f5d7de24c.tar.gz | |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linaroll-20151022.0ll_20151022.0
Conflicting files:
arch/arm64/configs/defconfig
Diffstat (limited to 'drivers/clk/at91/clk-programmable.c')
0 files changed, 0 insertions, 0 deletions