tree b746ced5bcf850e2daaeeb79c10f2443e2496da5
parent 2a596fc9d974bb040eda9ab70bf8756fcaaa6afe
parent 998140d26723bcddef5857e39077898b0d1bdb8f
author Maxime Ripard <maxime.ripard@free-electrons.com> 1500889349 +0200
committer Maxime Ripard <maxime.ripard@free-electrons.com> 1500889349 +0200

Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next