Merge 3.13-rc5 into staging-next

This resolves a merge issue with drivers/staging/imx-drm/imx-drm-core.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/staging/comedi/drivers.c
Simple merge

diff --cc drivers/staging/comedi/drivers/8255_pci.c
Simple merge

diff --cc drivers/staging/iio/magnetometer/hmc5843.c
Simple merge

diff --cc drivers/staging/imx-drm/imx-drm-core.c
index 0507b66,96e4eee..09ef5fb
--- 1/drivers/staging/imx-drm/imx-drm-core.c
--- 2/drivers/staging/imx-drm/imx-drm-core.c
+++ b/drivers/staging/imx-drm/imx-drm-core.c
@@@ -441,14 -443,19 +443,20 @@@ static int imx_drm_driver_load(struct d
         */
        imxdrm->drm->vblank_disable_allowed = true;
  
-       if (!imx_drm_device_get())
+       if (!imx_drm_device_get()) {
                ret = -EINVAL;
+               goto err_vblank;
+       }
  
 +      platform_set_drvdata(drm->platformdev, drm);
+       mutex_unlock(&imxdrm->mutex);
+       return 0;
  
-       ret = 0;
- 
- err_init:
+ err_vblank:
+       drm_vblank_cleanup(drm);
+ err_kms:
+       drm_kms_helper_poll_fini(drm);
+       drm_mode_config_cleanup(drm);
        mutex_unlock(&imxdrm->mutex);
  
        return ret;

diff --cc drivers/staging/imx-drm/ipu-v3/ipu-common.c
Simple merge