Daniel Vetter f7698ba75f Linux 3.13-rc3 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (GNU/Linux) iQEcBAABAgAGBQJSogqUAAoJEHm+PkMAQRiGM2MIAJrr5KEXEWuuAR4+JkkWBK7A +dVT4n1MM4wP/aCIyriSlq7kgT03Wxk4Q4wKsj2wZvDQkNgEQjrctgIihc75jqi5 126nmT3YXJLwgDpFA3RHZUWve3j3vfUG53rRuk7K9Xx1sGWU3Ls7BuInvQZ//+QS 6UB4UuEAalmose5U8ToXQfMqZhjwreZKeb64TEZwFvu2klv4cnka1L/zHbmQGgRg 2Pfv+aUrjsYE8s9lkEKX8MIQsDn28Q5Lsv7XIEQwo2at4rYbJaxX6usuC1OI0MQ5 BLUn1GgtvOidq6FzSg6kXiA/MJYH3J0S+p4uULWAprxA+KeJRbWNRroM94W1qAk= =1Wcq -----END PGP SIGNATURE----- Merge tag 'v3.13-rc3' into drm-intel-next-queued Linux 3.13-rc3 I need a backmerge for two reasons: - For merging the ppgtt patches from Ben I need to pull in the bdw support. - We now have duplicated calls to intel_uncore_forcewake_reset in the setup code to due 2 different patches merged into -next and 3.13. The conflict is silen so I need the merge to be able to apply Deepak's fixup patch. Conflicts: drivers/gpu/drm/i915/intel_display.c Trivial conflict, it doesn't even show up in the merge diff. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2013-12-09 09:19:14 +01:00
..
armada_drm.h	DRM: Armada: Add Armada DRM driver	2013-10-12 10:13:40 +01:00
drm.h	drm: Add a STEREO_3D capability to the SET_CLIENT_CAP ioctl	2013-10-01 07:45:27 +02:00
drm_fourcc.h
drm_mode.h	Merge tag 'v3.12' into drm-intel-next	2013-11-04 16:28:52 +01:00
drm_sarea.h
exynos_drm.h	drm/exynos: consider both case of vflip and hflip.	2013-01-04 15:54:33 +09:00
i810_drm.h
i915_drm.h	drm/i915: add i915_get_reset_stats_ioctl	2013-11-12 14:15:48 +01:00
Kbuild	drm/msm: add a3xx gpu support	2013-08-24 14:57:18 -04:00
mga_drm.h
msm_drm.h	drm/msm: add a3xx gpu support	2013-08-24 14:57:18 -04:00
nouveau_drm.h
omap_drm.h	drm/omap: move out of staging	2013-02-16 17:38:06 -05:00
qxl_drm.h	drm: add new QXL driver. (v1.4)	2013-04-12 13:51:07 +10:00
r128_drm.h
radeon_drm.h	drm/radeon/cik: Add macrotile mode array query	2013-11-18 09:19:36 -05:00
savage_drm.h
sis_drm.h
tegra_drm.h	drm/tegra: Deliver syncpoint base to user space	2013-10-31 09:55:48 +01:00
via_drm.h
vmwgfx_drm.h