Dave Airlie 5d42f82a9b Linux 3.16 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJT3rbVAAoJEHm+PkMAQRiGBc0H/0PcAqZ66KqBrjCaC7tlR9ZJ Oyv4usrPpVmJaCaYiNwc4KnkJXDfc/foEtZq32vYSb4d8xaOLta3DrT8YJTS7B7T Afdg8FbVdSjBD0S8It35XidmZlOaVrgGJGpDIRBRrqDwPPgbWpTeUR73bfkwoA/R ziW+78s0mquo9hN9Bdu3apr7XxVmzeIUx6lJxKPCoXNEGTsSC7ibCzZRzZDMpag/ D1JrQbE0XevgEu5fWrJkcqKceUzi3I1wuKZvBIJm2aX5XDsKpYNfQL6ViJDW56dK LhrB8vex8gkQYSCVPyUKx4BjkdPourSICSKq+h0SwhOCpHVHPmG8XM3J4/U4a7U= =yoNZ -----END PGP SIGNATURE----- Merge tag 'v3.16' into drm-next Linux 3.16 backmerge requested by i915, nouveau and radeon authors Conflicts: drivers/gpu/drm/i915/i915_gem_render_state.c drivers/gpu/drm/i915/intel_drv.h		2014-08-05 09:04:59 +10:00
..
core	drm/nouveau/therm: fix a potential deadlock in the therm monitoring code	2014-07-15 12:33:00 +10:00
dispnv04	drm/nouveau: replace drm_get_connector_name() with direct name field use	2014-06-04 13:14:41 +10:00
Kconfig	ACPI / gpu / drm: Stop selecting VIDEO_OUTPUT_CONTROL	2014-03-20 02:37:22 +01:00
Makefile	drm/gf117/i2c: no aux channels on this chipset	2014-06-18 15:49:50 +10:00
nouveau_abi16.c	support for platform devices	2014-03-26 14:08:04 +10:00
nouveau_abi16.h
nouveau_acpi.c	drm/nouveau/acpi: allow non-optimus setups to load vbios from acpi	2014-05-02 16:24:52 +10:00
nouveau_acpi.h
nouveau_agp.c	support for platform devices	2014-03-26 14:08:04 +10:00
nouveau_agp.h
nouveau_backlight.c	nouveau: Don't check acpi_video_backlight_support() before registering backlight	2014-05-27 01:29:00 +02:00
nouveau_bios.c	drm/nouveau: recognise higher link rate for available dp bw calculations	2014-03-26 14:08:21 +10:00
nouveau_bios.h
nouveau_bo.c	drm/ttm: Fix a few sparse warnings	2014-07-22 10:58:21 +10:00
nouveau_bo.h
nouveau_chan.c	support for platform devices	2014-03-26 14:08:04 +10:00
nouveau_chan.h
nouveau_connector.c	drm/nouveau: use helpers	2014-07-18 14:25:04 +10:00
nouveau_connector.h	drm/nouveau: register a drm_dp_aux channel for each dp connector	2014-06-11 16:11:04 +10:00
nouveau_crtc.h	drm/nv50-: prepare for attaching a SOR to multiple heads	2014-06-11 16:11:29 +10:00
nouveau_debugfs.c
nouveau_debugfs.h
nouveau_display.c	drm/nouveau/kms: reference vblank for crtc during pageflip.	2014-06-17 14:41:41 +10:00
nouveau_display.h	drm/nouveau: implement hooks for needed for drm vblank timestamping support	2014-01-30 09:20:27 +10:00
nouveau_dma.c
nouveau_dma.h
nouveau_dp.c	drm/nouveau/dp: probe dpcd to determine connectedness	2014-06-11 16:11:42 +10:00
nouveau_drm.c	drm/nouveau/kms: restore fbcon after display has been resumed	2014-07-08 12:56:54 +10:00
nouveau_drm.h	drm/nouveau: use nv_debug for NV_DEBUG, make DRM a separate subflag	2014-03-26 13:59:32 +10:00
nouveau_encoder.h	drm/nouveau/dp: probe dpcd to determine connectedness	2014-06-11 16:11:42 +10:00
nouveau_fbcon.c	Linux 3.16	2014-08-05 09:04:59 +10:00
nouveau_fbcon.h	drm/nouveau/kms: restore fbcon after display has been resumed	2014-07-08 12:56:54 +10:00
nouveau_fence.c	drm/nouveau/core: allow event source to handle multiple event types per index	2014-06-11 16:09:13 +10:00
nouveau_fence.h
nouveau_gem.c	drm/ttm: Fix a few sparse warnings	2014-07-22 10:58:21 +10:00
nouveau_gem.h
nouveau_hwmon.c	drm/nouveau/hwmon: replace strict_strtol() with kstrtol()	2014-03-26 13:59:31 +10:00
nouveau_hwmon.h
nouveau_ioc32.c	drm: Remove DRM_ARRAY_SIZE() for ARRAY_SIZE()	2014-06-10 09:36:17 +10:00
nouveau_ioctl.h
nouveau_prime.c
nouveau_reg.h
nouveau_sgdma.c	drm/nouveau/vm: reduce number of entry-points to vm_map()	2014-01-23 13:38:25 +10:00
nouveau_sysfs.c	support for platform devices	2014-03-26 14:08:04 +10:00
nouveau_sysfs.h
nouveau_ttm.c	drm/ttm: fix handling of TTM_PL_FLAG_TOPDOWN v2	2014-07-08 11:15:58 +10:00
nouveau_ttm.h
nouveau_vga.c	drm: Rip out totally bogus vga_switcheroo->can_switch locking	2014-04-23 10:32:33 +02:00
nouveau_vga.h
nv04_fbcon.c
nv04_fence.c
nv10_fence.c
nv10_fence.h
nv17_fence.c
nv50_display.c	drm/nv50-/kms: pass a non-zero value for head to sor dpms methods	2014-07-08 12:56:53 +10:00
nv50_display.h
nv50_fbcon.c
nv50_fence.c
nv84_fence.c
nvc0_fbcon.c
nvc0_fence.c