diff options
| author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2017-05-17 19:42:03 +0200 |
|---|---|---|
| committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2017-05-17 19:42:03 +0200 |
| commit | b2f33feddc53105808b742cc837de01da2ca7770 (patch) | |
| tree | 220f90d5a710a295124f31b31677b8a96044d221 /drivers | |
| parent | 9bff96266476f022335dc218a928300c43f9c040 (diff) | |
| parent | 3c5331131bf928288d8ddf2bfc49d48fc35d8a50 (diff) | |
| parent | d50ada85a015458bb6f4f7997d2befe88fb9a98a (diff) | |
Merge branches 'sunxi/dt-for-4.13' and 'sunxi/clk-for-4.13' into sunxi/for-next