quick Merge /home/v4l/v4l/for_upstream

* /home/v4l/v4l/for_upstream:
  [media] s5p-fimc: Stop media entity pipeline if fimc_pipeline_validate fails
  [media] s5p-fimc: Fix compiler warning in fimc-lite.c
  [media] s5p-fimc: media_entity_pipeline_start() may fail
  [media] s5p-fimc: Update to the control handler lock changes
  [media] s5p-fimc: Shorten pixel formats description
  [media] s5p-fimc: Fix fimc-lite system wide suspend procedure
  [media] s5p-fimc: Prevent lock-up in multiple sensor systems
  [media] s5p-fimc: Remove superfluous checks for buffer type
  [media] s5p-fimc: Honour sizeimage in VIDIOC_S_FMT
  [media] s5p-fimc: Don't create multiple active links to same sink entity
  [media] s5p-fimc: Fix bug in capture node open()

diff --cc drivers/media/video/s5p-fimc/fimc-capture.c
Simple merge

diff --cc drivers/media/video/s5p-fimc/fimc-core.c
Simple merge

diff --cc drivers/media/video/s5p-fimc/fimc-mdevice.c
Simple merge