Merge tag 'omapdrm-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux...
authorDave Airlie <airlied@redhat.com>
Tue, 28 Jan 2014 23:37:47 +0000 (09:37 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 28 Jan 2014 23:37:47 +0000 (09:37 +1000)
commitdee13f12f6ab0c0927adf9168dfc84da93fc9f13
tree593748d4054a7d623ca04be3b93cd9ae7126f961
parent5a0abe30bebae3e73bf7808f55b2cd0309fa101d
parent3d232346c5656b300028b6c920ddc10b229b5264
Merge tag 'omapdrm-3.14' of git://git./linux/kernel/git/tomba/linux into drm-next

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
drivers/gpu/drm/omapdrm/omap_drv.c
drivers/gpu/drm/omapdrm/omap_drv.h
drivers/gpu/drm/omapdrm/omap_irq.c