Merge commit 'vsp1-kms-20151112~4' of git://linuxtv.org/pinchartl/media.git into renesas-drivers
Conflicts:
arch/arm64/boot/dts/renesas/r8a7795.dtsi
arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
arch/arm64/configs/defconfig
arch/arm/arm-soc-for-next-contents.txt
drivers/clk/clk-cs2000-cp.c
drivers/clk/shmobile/clk-cpg-mssr.c
drivers/clk/shmobile/clk-cpg-mssr.h
drivers/clk/shmobile/clk-r8a7795-cpg-mssr.c
drivers/clk/shmobile/r8a7795-cpg-mssr.c
drivers/clk/shmobile/Makefile
drivers/clocksource/h8300_timer16.c
drivers/clocksource/h8300_timer8.c
drivers/clocksource/h8300_tpu.c
drivers/i2c/busses/i2c-rcar.c
drivers/iommu/Kconfig
drivers/sh/pm_runtime.c
drivers/staging/mt29f_spinand/mt29f_spinand.c
include/linux/compiler-gcc.h
include/linux/platform_data/atmel.h
sound/soc/intel/skylake/skl.h
sound/soc/intel/skylake/skl-pcm.c
sound/soc/intel/skylake/skl-topology.c
sound/soc/sh/rcar/cmd.c
sound/soc/sh/rcar/core.c
sound/soc/sh/rcar/dma.c
sound/soc/sh/rcar/dvc.c
sound/soc/sh/rcar/mix.c
sound/soc/sh/rcar/rsnd.h
sound/soc/sh/rcar/src.c
sound/soc/sh/rcar/ssi.c
sound/soc/sh/rcar/ssiu.c
