tree fcb297f559a1d95cc94a5eb13eb1055b5bed3e9e
parent b00ff043d164bba5d43cbac42bdf0aeeb43fbda8
parent 5ac4837b12f533de5d9f8f66b45494c58e805536
author Dave Airlie <airlied@redhat.com> 1418010318 +1000
committer Dave Airlie <airlied@redhat.com> 1418010318 +1000

Merge branch 'drm_iommu_v15' of https://github.com/markyzq/kernel-drm-rockchip into drm-next

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