commit | a633abe6e6393c60417bd8cb0cf82f3297740198 | [log] [tgz] |
---|---|---|
author | Geert Uytterhoeven <geert+renesas@glider.be> | Tue Feb 16 11:58:21 2016 +0100 |
committer | Geert Uytterhoeven <geert+renesas@glider.be> | Tue Feb 16 11:58:29 2016 +0100 |
tree | 76e731e3b51aecbd5eaa5946f0883d851b753fd8 | |
parent | fff67827a256cd1956226d986bb8f49fd351c94b [diff] | |
parent | 12cc44c704eb9289674414aef09b9dc293457e2a [diff] |
Merge commit 'drm/du/vsp1-kms/boards~5' of git://linuxtv.org/pinchartl/media.git into renesas-drivers Conflicts: arch/arm64/boot/dts/renesas/r8a7795.dtsi