diff options
author | Dave Airlie <airlied@redhat.com> | 2014-12-08 13:45:18 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-12-08 13:45:18 +1000 |
commit | b75478d1c7e4758abcf15c8494d70d4dc4dcb553 (patch) | |
tree | fcb297f559a1d95cc94a5eb13eb1055b5bed3e9e /include/drm/drm_fb_helper.h | |
parent | Merge branch 'amdkfd-next-3.19' of git://people.freedesktop.org/~gabbayo/linux into drm-next (diff) | |
parent | dt-bindings: video: Add documentation for rockchip vop (diff) | |
download | linux-dev-b75478d1c7e4758abcf15c8494d70d4dc4dcb553.tar.xz linux-dev-b75478d1c7e4758abcf15c8494d70d4dc4dcb553.zip |
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
Diffstat (limited to 'include/drm/drm_fb_helper.h')
0 files changed, 0 insertions, 0 deletions