diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-08 01:35:08 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-08 01:35:08 +0200 |
| commit | 635a4ba111e3bd0169fd549b24fe108b1f171713 (patch) | |
| tree | 4bacab1cee05da1781e2479829f70a2eb767b81d /fs/nilfs2/btree.c | |
| parent | Merge tag 'doc-4.8-fixes' of git://git.lwn.net/linux (diff) | |
| parent | Merge branch 'generic-zpos-v8' of http://git.linaro.org/people/benjamin.gaign... (diff) | |
| download | linux-635a4ba111e3bd0169fd549b24fe108b1f171713.tar.xz linux-635a4ba111e3bd0169fd549b24fe108b1f171713.zip | |
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 'fs/nilfs2/btree.c')
0 files changed, 0 insertions, 0 deletions