| commit | ab3abe194e9a0314666deb641b5eb219a9ccde02 | [log] [tgz] |
|---|---|---|
| author | Geert Uytterhoeven <geert+renesas@glider.be> | Tue Jan 19 11:54:31 2016 +0100 |
| committer | Geert Uytterhoeven <geert+renesas@glider.be> | Tue Jan 19 12:03:42 2016 +0100 |
| tree | 00e5ed847057c58ac4589c5e555312144620555c | |
| parent | 1fc79fc49f45f153133ba7b51cb380c5ba3d8f60 [diff] | |
| parent | c0d74680b7cf7494b5b9d6e2a52b216b7f1ef22f [diff] |
Merge commit 'vsp1-kms-20151217~3' of git://linuxtv.org/pinchartl/media.git into renesas-drivers Conflicts: arch/arm64/boot/dts/renesas/r8a7795.dtsi drivers/clk/shmobile/r8a7795-cpg-mssr.c drivers/clk/shmobile/renesas-cpg-mssr.c drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c drivers/media/platform/vsp1/vsp1_video.c