diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-05-17 00:06:14 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-05-17 00:06:14 +0300 |
| commit | 99ee87295017e36abb6925e6139ca303cb55aee7 (patch) | |
| tree | 259fb5d2fd348147fd17378fdbf98761c32116e5 /Documentation/CodeOfConflict | |
| parent | 76e9cab5403809fa1fa6f698d2f7c1b7dd224022 (diff) | |
| parent | 9ecb549867d7f642f0379f574f0e52870009a8bf (diff) | |
| download | linux-99ee87295017e36abb6925e6139ca303cb55aee7.tar.xz | |
Merge tag 'topic/drm-misc-2016-05-13' of git://anongit.freedesktop.org/drm-intel into drm-next
I kinda hoped that I could still sneak in Noralf's
drm_simple_display_pipe, since there's intereset by others now (for tilcdc
at least). But it wasn't ready by a hair. Oh well.
Otherwise random stuff plus prep patches from Noralf.
* tag 'topic/drm-misc-2016-05-13' of git://anongit.freedesktop.org/drm-intel:
drm/atomic: Add drm_atomic_helper_best_encoder()
drm/atomic: Don't skip drm_bridge_*() calls if !drm_encoder_helper_funcs
drm/fb-cma-helper: Hook up to DocBook and fix some docs
drm/fb-helper: Remove mention of CONFIG_FB_DEFERRED_IO in docs
drm/sti: include linux/seq_file.h where needed
drm/tegra: Use lockless gem BO free callback
drm/exynos: Use lockless gem BO free callback
drm: Make drm_encoder_helper_funcs optional
Diffstat (limited to 'Documentation/CodeOfConflict')
0 files changed, 0 insertions, 0 deletions