Merge /home/v4l/v4l/for_upstream

* /home/v4l/v4l/for_upstream:
  [media] s5p-fimc: Fix camera input configuration in subdev operations
  [media] m5mols: Fix logic in sanity check
  [media] ati_remote: switch to single-byte scancodes
  [media] V4L: mt9m111: fix uninitialised mutex
  [media] V4L: omap1_camera: fix missing <linux/module.h> include
  [media] V4L: mt9t112: use after free in mt9t112_probe()
  [media] V4L: soc-camera: fix compiler warnings on 64-bit platforms
  [media] s5p_mfc_enc: fix s/H264/H263/ typo
  [media] omap_vout: Fix compile error in 3.1
  [media] au0828: add missing models 72101, 72201 & 72261 to the model matrix
  [media] au0828: add missing USB ID 2040:7213
  [media] au0828: add missing USB ID 2040:7260
  [media] [trivial] omap24xxcam-dma: Fix logical test
  [media] omap_vout: fix crash if no driver for a display

diff --cc drivers/media/video/m5mols/m5mols_core.c
Simple merge

diff --cc drivers/media/video/mt9m111.c
Simple merge

diff --cc drivers/media/video/omap/omap_vout.c
Simple merge

diff --cc drivers/media/video/ov6650.c
Simple merge

diff --cc drivers/media/video/sh_mobile_csi2.c
Simple merge