summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/imx/imx-drm.h
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-12-02 10:58:33 +1000
committerDave Airlie <airlied@redhat.com>2014-12-02 10:58:33 +1000
commite8115e79aa62b6ebdb3e8e61ca4092cc32938afc (patch)
tree42b791ab54ef9d5c73dcd49f907b8b37fa2f7e19 /drivers/gpu/drm/imx/imx-drm.h
parent9be23ae4350bfd71c0cc2ea3494671ee90e5603b (diff)
parent009d0431c3914de64666bec0d350e54fdd59df6a (diff)
downloadblackbird-op-linux-e8115e79aa62b6ebdb3e8e61ca4092cc32938afc.tar.gz
blackbird-op-linux-e8115e79aa62b6ebdb3e8e61ca4092cc32938afc.zip
Merge tag 'v3.18-rc7' into drm-next
This fixes a bunch of conflicts prior to merging i915 tree. Linux 3.18-rc7 Conflicts: drivers/gpu/drm/exynos/exynos_drm_drv.c drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/intel_pm.c drivers/gpu/drm/tegra/dc.c
Diffstat (limited to 'drivers/gpu/drm/imx/imx-drm.h')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud