summaryrefslogtreecommitdiffstats
path: root/include/media/v4l2-ctrls.h
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2017-02-26 21:34:42 +0100
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-02-26 21:34:42 +0100
commit8e22e1b3499a446df48c2b26667ca36c55bf864c (patch)
tree5329f98b3eb3c95a9dcbab0fa4f9b6e62f0e788d /include/media/v4l2-ctrls.h
parentdrm: Add name for DRM_DP_DUAL_MODE_LSPCON (diff)
parentlib/Kconfig: make PRIME_NUMBERS not user selectable. (diff)
downloadlinux-8e22e1b3499a446df48c2b26667ca36c55bf864c.tar.xz
linux-8e22e1b3499a446df48c2b26667ca36c55bf864c.zip
Merge airlied/drm-next into drm-misc-next
Backmerge the main pull request to sync up with all the newly landed drivers. Otherwise we'll have chaos even before 4.12 started in earnest. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'include/media/v4l2-ctrls.h')
0 files changed, 0 insertions, 0 deletions