From: Dave Airlie Date: Wed, 3 Jun 2015 23:24:28 +0000 (+1000) Subject: Merge branch 'linux-4.1.0-rc5-tilcdc-refactor' of https://github.com/jsarha/linux... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6aa627250354c73ec705040b3a327b2915756fac;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git Merge branch 'linux-4.1.0-rc5-tilcdc-refactor' of https://github.com/jsarha/linux into drm-next Please pull the contents of "Use DRM component API in tilcdc to connect to tda998x" patch series. * 'linux-4.1.0-rc5-tilcdc-refactor' of https://github.com/jsarha/linux: drm/tilcdc: Force building of DRM_TILCDC_SLAVE_COMPAT drm/tilcdc: Add DRM_TILCDC_SLAVE_COMPAT for ti,tilcdc,slave binding support drm/tilcdc: use pm_runtime_irq_safe() drm/tilcdc: Add support for external tda998x encoder drm/tilcdc: Remove tilcdc slave support for tda998x driver drm/tilcdc: Fix module unloading --- 6aa627250354c73ec705040b3a327b2915756fac