Merge branch 'drm_iommu_v15' of https://github.com/markyzq/kernel-drm-rockchip into...
authorDave Airlie <airlied@redhat.com>
Mon, 8 Dec 2014 03:45:18 +0000 (13:45 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 8 Dec 2014 03:45:18 +0000 (13:45 +1000)
Merge rockchip GPU support.

This has a branch in common with the iommu tree, hopefully the
process works.

* 'drm_iommu_v15' of https://github.com/markyzq/kernel-drm-rockchip:
  dt-bindings: video: Add documentation for rockchip vop
  dt-bindings: video: Add for rockchip display subsytem
  drm: rockchip: Add basic drm driver
  dt-bindings: iommu: Add documentation for rockchip iommu
  iommu/rockchip: rk3288 iommu driver

1  2 
drivers/gpu/drm/Kconfig
drivers/gpu/drm/Makefile

Simple merge
Simple merge