| commit | 76f3563af3b66b178d9a36b5ebcbcd4752b9d53f | [log] [tgz] |
|---|---|---|
| author | Geert Uytterhoeven <geert+renesas@glider.be> | Wed Aug 05 14:26:22 2015 +0200 |
| committer | Geert Uytterhoeven <geert+renesas@glider.be> | Wed Aug 05 14:26:22 2015 +0200 |
| tree | 22464c81f2ebcff94d93ebd75326a9a3e09aceb7 | |
| parent | 1933dec2d2a133ce897237c74605c9652f4fbacf [diff] | |
| parent | 785a7f1da2ab874f550ed71cc7e25e61f0846f85 [diff] |
Merge branch 'drm/du/vsp1-kms' of git://linuxtv.org/pinchartl/media into base Conflicts: arch/arm/boot/dts/r8a7791.dtsi drivers/gpu/drm/drm_crtc.c