From: Dave Airlie <airlied@redhat.com>
Date: Tue, 28 Jan 2014 23:37:47 +0000 (+1000)
Subject: Merge tag 'omapdrm-3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux... 
X-Git-Tag: v3.14-rc1~47^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dee13f12f6ab0c0927adf9168dfc84da93fc9f13;p=pandora-kernel.git

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
---

dee13f12f6ab0c0927adf9168dfc84da93fc9f13
Reading git-diff-tree failed