Daniel Vetter c0c8b9ed1b Merge tag 'drm-for-v4.9' into drm-intel-next-queued ... It's been over two months, git definitely lost it's marbles. Conflicts resolved by picking our version, plus manually checking the diff with the parent in drm-intel-next-queued to make sure git didn't do anything stupid. It did, so I removed 2 occasions where it double-inserted a bit of code. The diff is now just - kernel-doc changes - drm format/name changes - display-info changes so looks all reasonable. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>		2016-10-12 08:22:25 +02:00
..
bridge	drm/bridge: analogix_dp: Add analogix_dp_psr_supported	2016-10-04 08:23:16 +02:00
i2c	drm/i2c: tda998x: Register ASoC hdmi-codec and add audio DT binding	2016-09-07 13:10:10 +01:00
ttm	drm/ttm: remove cpu_address member from ttm_tt	2016-09-16 15:53:05 -04:00
ati_pcigart.h
drm_agpsupport.h
drm_atomic_helper.h	drm/fence: allow fence waiting to be interrupted by userspace	2016-09-12 16:59:15 -04:00
drm_atomic.h	drm: Extract drm_plane.[hc]	2016-09-22 00:01:56 -07:00
drm_auth.h	drm: document drm_auth.c	2016-06-21 22:10:55 +02:00
drm_blend.h	drm: Fix plane type uabi breakage	2016-09-22 23:52:12 -07:00
drm_bridge.h	drm: Extract drm_bridge.h	2016-09-19 15:04:15 +02:00
drm_cache.h
drm_color_mgmt.h	drm/doc: Document color space handling	2016-09-22 00:04:03 -07:00
drm_connector.h	drm: use the right function name in documentation	2016-10-10 11:24:10 +02:00
drm_crtc_helper.h	drm/kms-helpers: Extract drm_modeset_helper.[hc]	2016-08-16 16:10:19 +02:00
drm_crtc.h	drm/crtc: constify drm_crtc_index parameter	2016-10-10 17:28:58 +02:00
drm_displayid.h
drm_dp_dual_mode_helper.h
drm_dp_helper.h	drm: Add DP branch device info on debugfs	2016-09-15 14:51:07 +03:00
drm_dp_mst_helper.h	drm/dp-mst: Missing kernel doc	2016-07-19 10:31:53 +02:00
drm_edid.h	drm: Move all decl for drm_edid.c to drm_edid.h	2016-09-19 15:04:32 +02:00
drm_encoder_slave.h
drm_encoder.h	drm: Move a few macros away from drm_crtc.h	2016-09-19 15:03:46 +02:00
drm_fb_cma_helper.h	drm/fb_cma_helper: add suspend helper	2016-06-18 18:33:54 -07:00
drm_fb_helper.h	drm/fb-helper: fix sphinx markup for DRM_FB_HELPER_DEFAULT_OPS	2016-10-10 11:19:42 +02:00
drm_fixed.h
drm_flip_work.h
drm_fourcc.h	drm: move drm_mode_legacy_fb_format to drm_fourcc.c	2016-08-29 15:37:28 +02:00
drm_framebuffer.h	drm: Move a few macros away from drm_crtc.h	2016-09-19 15:03:46 +02:00
drm_gem_cma_helper.h
drm_gem.h	drm/doc: Fix more kerneldoc/sphinx warnings	2016-08-16 16:09:58 +02:00
drm_global.h
drm_hashtab.h
drm_irq.h	drm: Extract&Document drm_irq.h	2016-07-19 10:29:47 +02:00
drm_legacy.h	drm: document drm_auth.c	2016-06-21 22:10:55 +02:00
drm_mem_util.h
drm_mipi_dsi.h	drm/dsi: Implement DCS set/get display brightness	2016-08-24 13:34:00 +02:00
drm_mm.h	drm: Track drm_mm nodes with an interval tree	2016-08-08 10:05:16 +02:00
drm_mode_object.h	drm: Extract drm_bridge.h	2016-09-19 15:04:15 +02:00
drm_modes.h	drm: Extract drm_bridge.h	2016-09-19 15:04:15 +02:00
drm_modeset_helper_vtables.h	drm/atomic-helper: Add atomic_disable CRTC helper callback	2016-08-29 10:21:52 +02:00
drm_modeset_helper.h	drm/kms-helpers: Extract drm_modeset_helper.[hc]	2016-08-16 16:10:19 +02:00
drm_modeset_lock.h
drm_of.h
drm_os_linux.h
drm_panel.h
drm_pciids.h
drm_plane_helper.h	drm/kms-helpers: Extract drm_modeset_helper.[hc]	2016-08-16 16:10:19 +02:00
drm_plane.h	drm: Fix plane type uabi breakage	2016-09-22 23:52:12 -07:00
drm_property.h	drm: Move a few macros away from drm_crtc.h	2016-09-19 15:03:46 +02:00
drm_rect.h
drm_simple_kms_helper.h	drm: simple_kms_helper: Add prepare_fb and cleanup_fb hooks	2016-10-05 15:18:02 +02:00
drm_sysfs.h
drm_vma_manager.h	drm: use drm_file to tag vm-bos	2016-09-19 11:22:08 +02:00
drmP.h	drm/prime: Take a ref on the drm_dev when exporting a dma_buf	2016-10-05 15:30:32 +02:00
gma_drm.h
i915_component.h	drm/i915/dp: DP audio API changes for MST	2016-09-22 09:01:55 -07:00
i915_drm.h	drm: avoid "possible bad bitmask?" warning	2016-08-09 22:18:26 +02:00
i915_pciids.h	drm/i915: Remove .is_mobile field from platform struct	2016-09-07 16:07:07 -07:00
intel-gtt.h	drm/i915: Add support for mapping an object page by page	2016-06-13 10:03:54 +01:00