From: Dave Airlie <airlied@redhat.com>
Date: Mon, 8 Dec 2014 03:45:18 +0000 (+1000)
Subject: Merge branch 'drm_iommu_v15' of https://github.com/markyzq/kernel-drm-rockchip into... 
X-Git-Tag: MMI-PSA29.97-13-9~10979^2~6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b75478d1c7e4758abcf15c8494d70d4dc4dcb553;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

b75478d1c7e4758abcf15c8494d70d4dc4dcb553