Merge /home/v4l/v4l/for_upstream

Merge /home/v4l/v4l/for_upstream

* /home/v4l/v4l/for_upstream:
  [media] media: video: s5p-tv: fix build break
  [media] omap3isp: fix compilation of ispvideo.c
  [media] m5mols: Fix set_fmt to return proper pixel format code
  [media] s5p-fimc: Use correct fourcc for RGB565 colour format
  [media] s5p-fimc: Fail driver probing when sensor configuration is wrong
  [media] s5p-fimc: Adjust pixel height alignments according to the IP revision
  [media] s5p-fimc: Allow probe() to succeed with null platform data
  [media] s5p-fimc: Fix buffer dequeue order issue
  [media] s5p-fimc: Fix initialization for proper system suspend support
  [media] s5p-fimc: Fix error in the capture subdev deinitialization
  [media] s5p-fimc: Fix wrong pointer dereference when unregistering sensors
  [media] media/staging: fix allyesconfig build error
  MAINTAINERS: Update media entries
  [media] mxl5007t: fix reg read
  [media] tda18218: fix 6 MHz default IF frequency
  [media] af9015: limit I2C access to keep FW happy

Conflicts:
	drivers/media/common/tuners/tda18218.c
	drivers/staging/media/as102/as102_drv.h