Merge tag 'omapdrm-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux...

omapdrm patches for 3.14

* tag 'omapdrm-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  drm/omap: Enable DT support for DMM
  drm/omap: fix: change dev_unload order
  drm/omap: fix: disable encoder before destroying it
  drm/omap: fix: disconnect devices when omapdrm module is removed
  drm/omap: fix: Defer probe if an omapdss device requests for it at connect
  drm/omap: fix (un)registering irqs inside an irq handler

Conflicts:
	drivers/gpu/drm/omapdrm/omap_drv.c

diff --cc drivers/gpu/drm/omapdrm/omap_drv.c
index 13f294a,c57e99c..bf39fcc
--- 1/drivers/gpu/drm/omapdrm/omap_drv.c
--- 2/drivers/gpu/drm/omapdrm/omap_drv.c
+++ b/drivers/gpu/drm/omapdrm/omap_drv.c
@@@ -665,9 -695,12 +695,11 @@@ static int pdev_probe(struct platform_d
  static int pdev_remove(struct platform_device *device)
  {
        DBG("");
 -      drm_platform_exit(&omap_drm_driver, device);
  
-       drm_put_dev(platform_get_drvdata(device));
+       omap_disconnect_dssdevs();
+       omap_crtc_pre_uninit();
  
 -      platform_driver_unregister(&omap_dmm_driver);
++      drm_put_dev(platform_get_drvdata(device));
        return 0;
  }
  

diff --cc drivers/gpu/drm/omapdrm/omap_drv.h
Simple merge

diff --cc drivers/gpu/drm/omapdrm/omap_irq.c
Simple merge