diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-09-02 15:33:42 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-09-02 15:33:42 +0300 |
| commit | e93c28f39375558409329a02a767d5cadfcc4a31 (patch) | |
| tree | 9f1b4b5ce765b887b6002cded59fc934e6c9c012 /include/media/v4l2-ctrls.h | |
| parent | 85a62bf9d8ef8d533635270ae985281c58e8c974 (diff) | |
| parent | 6fa2d197936ba0b8936e813d0adecefac160062b (diff) | |
| download | linux-e93c28f39375558409329a02a767d5cadfcc4a31.tar.xz | |
Merge tag 'drm-intel-next-fixes-2015-09-02' into drm-intel-next-queued
Backmerge -fixes since there's more DDI-E related cleanups on top of
the pile of -fixes for skl that just landed for 4.3.
Conflicts:
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i914/intel_dp.c
drivers/gpu/drm/i915/intel_lrc.c
Conflicts are all fairly harmless adjacent line stuff.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/media/v4l2-ctrls.h')
0 files changed, 0 insertions, 0 deletions