Daniel Vetter 0654a65f26 Linux 3.14 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJTOOOnAAoJEHm+PkMAQRiGsBAH/2PAOL3TbOG6tEedxQrTwsr2 muRIRTVWawjT8/npbHupxGnAyAVdmdffBHpmCmcftKdKNryT3YZW8/JWoYc+WSlo 3vTDJHDOYAe6yCBjjhYwcu150THBQdOymOi5mbbclo0XWYG18jd3+abYprRH6SiD XqNSzYqoiv91JHBAWKBIpo1cyRDuwoM7+jZ7gX41r2800EL7loY3e08cPDDNU6HA CKaLXMwLwYTefE+Wnr+4UUr08NbNBbBUKLUSXVqKKIpd+MtbyhV1SnWzz8VQSkag K/uzsnGnE7nrqoepMSx3nXxzOWxUSY2EMbwhEjaKK4xBq9C9pzv3sG/o2/IyopU= =Nuom -----END PGP SIGNATURE----- Merge tag 'v3.14' into drm-intel-next-queued Linux 3.14 The vt-d w/a merged late in 3.14-rc needs a bit of fine-tuning, hence backmerge. Conflicts: drivers/gpu/drm/i915/i915_gem_gtt.c drivers/gpu/drm/i915/intel_ddi.c drivers/gpu/drm/i915/intel_dp.c All trivial adjacent lines changed type conflicts, so trivial git doesn't even show them in the merg commit. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2014-03-31 10:45:15 +02:00
..
Kconfig	drm: Add separate Kconfig option for fbdev helpers	2013-10-11 23:36:58 +02:00
Makefile	drm/udl: initial UDL driver (v4)	2012-03-15 13:35:34 +00:00
udl_connector.c	udl: handle EDID failure properly.	2013-04-12 14:20:38 +10:00
udl_drv.c	drm: kill ->gem_init_object() and friends	2013-10-09 14:38:02 +10:00
udl_drv.h	drm: kill ->gem_init_object() and friends	2013-10-09 14:38:02 +10:00
udl_encoder.c	Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux	2012-10-03 23:29:23 -07:00
udl_fb.c	drm/udl: fix error-path when damage-req fails	2014-03-16 12:11:01 +01:00
udl_gem.c	Linux 3.14	2014-03-31 10:45:15 +02:00
udl_main.c	drm: don't push static constants on stack for %*ph	2013-08-07 10:10:58 +10:00
udl_modeset.c	drm: Drop all the stub gamma_get, gamma_set, load_lut functions from drivers	2013-06-17 19:42:47 +10:00
udl_transfer.c	drm/udl: Inline memcmp() for RLE compression of xfer	2013-02-08 11:52:00 +10:00