summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-07 16:35:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-07 16:35:08 -0700
commit635a4ba111e3bd0169fd549b24fe108b1f171713 (patch)
tree4bacab1cee05da1781e2479829f70a2eb767b81d /Makefile
parent52ddb7e9dd735c1a10722c58d3e069af4d3e6df2 (diff)
parent586efded6b8beb932e9a356f351b0c681503358f (diff)
downloadlinux-635a4ba111e3bd0169fd549b24fe108b1f171713.tar.bz2
Merge tag 'drm-for-v4.8-zpos' of git://people.freedesktop.org/~airlied/linux
Pull drm zpos property support from Dave Airlie: "This tree was waiting on some media stuff I hadn't had time to get a stable branchpoint off, so I just waited until it was all in your tree first. It's been around a bit on the list and shouldn't affect anything outside adding the generic API and moving some ARM drivers to using it" * tag 'drm-for-v4.8-zpos' of git://people.freedesktop.org/~airlied/linux: drm: rcar: use generic code for managing zpos plane property drm/exynos: use generic code for managing zpos plane property drm: sti: use generic zpos for plane drm: add generic zpos property
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions