summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/ctree.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2016-08-03 00:40:24 +0200
committerDave Airlie <airlied@redhat.com>2016-08-03 00:40:24 +0200
commit586efded6b8beb932e9a356f351b0c681503358f (patch)
tree1c9af56fa0d2c70bf93cf5a02429f4b5b7d11007 /fs/btrfs/ctree.c
parentdrm/i915: Check PSR setup time vs. vblank length (diff)
parentdrm: rcar: use generic code for managing zpos plane property (diff)
downloadlinux-586efded6b8beb932e9a356f351b0c681503358f.tar.xz
linux-586efded6b8beb932e9a356f351b0c681503358f.zip
Merge branch 'generic-zpos-v8' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next
Merge generic ZPOS property support, this was backed up behind some other changes I didn't have a stable branch point for. Now they are merged to Linus tree this pull is just drm patches. * 'generic-zpos-v8' of http://git.linaro.org/people/benjamin.gaignard/kernel: 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/btrfs/ctree.c')
0 files changed, 0 insertions, 0 deletions