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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/media/common/tuners/mxl5007t.c
Simple merge

diff --cc drivers/media/common/tuners/tda18218.c
index 1c865950ddf49697a9bd5e1c69dc9782ab8217da,4fc29730a12ccf2305739c34efa625deef0a1f95..d099501566a105cf297ada07f9b144920166f751
--- 1/drivers/media/common/tuners/tda18218.c
--- 2/drivers/media/common/tuners/tda18218.c
+++ b/drivers/media/common/tuners/tda18218.c
@@@ -141,7 -141,7 +141,7 @@@ static int tda18218_set_params(struct d
        switch (params->u.ofdm.bandwidth) {
        case BANDWIDTH_6_MHZ:
                LP_Fc = 0;
-               priv->if_frequency = 4000000;
 -              LO_Frac = params->frequency + 3000000;
++              priv->if_frequency = 3000000;
                break;
        case BANDWIDTH_7_MHZ:
                LP_Fc = 1;

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

diff --cc drivers/staging/media/as102/as102_drv.c
Simple merge

diff --cc drivers/staging/media/as102/as102_drv.h
index 0ecef9e1a6961ad31acc90f39eda8957aefb9a81,fd33f5a12dcc2167cf9dada508b13521f7159b8f..957f0ed0d81aae7c8d587dbca4b853cf862b3814
--- 1/drivers/staging/media/as102/as102_drv.h
--- 2/drivers/staging/media/as102/as102_drv.h
+++ b/drivers/staging/media/as102/as102_drv.h
@@@ -27,9 -37,8 +27,10 @@@
  #define DRIVER_FULL_NAME "Abilis Systems as10x usb driver"
  #define DRIVER_NAME "as10x_usb"
  
- extern int debug;
+ extern int as102_debug;
+ #define debug as102_debug
 +extern struct usb_driver as102_usb_driver;
 +extern int elna_enable;
  
  #define dprintk(debug, args...) \
        do { if (debug) {       \