| commit | d7ba9d1e0b037c24ee7f278fdcf9c44f80f3dbe7 | [log] [tgz] |
|---|---|---|
| author | Geert Uytterhoeven <geert+renesas@glider.be> | Tue Aug 18 09:50:02 2015 +0200 |
| committer | Geert Uytterhoeven <geert+renesas@glider.be> | Tue Aug 18 09:50:02 2015 +0200 |
| tree | b5eb717c8d45354231d2316bb8a7f2ca5fee441d | |
| parent | b67a3372f590ea0bc451d004e5afabf8b8b2ff26 [diff] | |
| parent | 43774a8ceacf8589089259902f4b6a5f1673c163 [diff] |
Merge tag 'vsp1-kms-gen2-20150811' of git://linuxtv.org/pinchartl/media into base Conflicts: arch/arm/boot/dts/r8a7794.dtsi