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
..
core	Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes	2014-02-18 16:22:40 +10:00
dispnv04	drm/nouveau: create base display from common code	2014-01-23 13:39:18 +10:00
Kconfig	drm: Add separate Kconfig option for fbdev helpers	2013-10-11 23:36:58 +02:00
Makefile	drm/nv4c/mc: nv4x igp's have a different msi rearm register	2014-02-18 10:36:45 +10:00
nouveau_abi16.c	drm/nouveau: return offset of allocated notifier	2014-01-07 13:38:06 +10:00
nouveau_abi16.h
nouveau_acpi.c	ACPI / nouveau: fix probing regression related to _DSM	2014-02-20 21:19:47 +01:00
nouveau_acpi.h
nouveau_agp.c	drm/nouveau/agp: add a quirk list to limit agp modes	2013-11-08 15:39:54 +10:00
nouveau_agp.h
nouveau_backlight.c	drm/sysfs: sort out minor and connector device object lifetimes.	2013-10-22 09:37:40 +01:00
nouveau_bios.c	drm: Remove pci_vendor and pci_device from struct drm_device	2013-10-09 15:55:33 +10:00
nouveau_bios.h
nouveau_bo.c	drm/nouveau: fix TTM_PL_TT memtype on pre-nv50	2014-02-18 10:37:18 +10:00
nouveau_bo.h	drm/nouveau: embed gem object in nouveau_bo	2013-10-09 14:37:55 +10:00
nouveau_chan.c	drm/nv10-: we no longer need to create nvsw object on user channels	2013-11-14 14:56:43 +10:00
nouveau_chan.h
nouveau_connector.c	drm/nv10: introduce a new NV_11 card type	2013-11-08 15:37:35 +10:00
nouveau_connector.h	drm/nouveau: remove prototype for non-existent nouveau_connector_bpp	2013-11-08 15:36:08 +10:00
nouveau_crtc.h
nouveau_debugfs.c
nouveau_debugfs.h
nouveau_display.c	drm/nouveau: fix lock unbalance in nouveau_crtc_page_flip	2014-01-30 09:20:28 +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	drm: Kill DRM_*MEMORYBARRIER	2013-12-18 11:35:21 +10:00
nouveau_dma.h	drm: Kill DRM_*MEMORYBARRIER	2013-12-18 11:35:21 +10:00
nouveau_dp.c
nouveau_drm.c	drm/nouveau: fail runtime pm properly.	2014-03-27 02:20:37 +00:00
nouveau_drm.h	drm/nouveau: create base display from common code	2014-01-23 13:39:18 +10:00
nouveau_encoder.h
nouveau_fbcon.c	drm/nouveau/fbcon: bracket entrypoints with a per-device enabled check	2013-11-08 15:39:56 +10:00
nouveau_fbcon.h
nouveau_fence.c	drm: Kill DRM_HZ	2013-12-18 11:33:24 +10:00
nouveau_fence.h
nouveau_gem.c	drm: init TTM dev_mapping in ttm_bo_device_init()	2014-03-16 12:23:42 +01:00
nouveau_gem.h	drm: kill ->gem_init_object() and friends	2013-10-09 14:38:02 +10:00
nouveau_hwmon.c	drm/nouveau/hwmon: fix compilation without CONFIG_HWMON	2013-11-28 14:38:09 +10:00
nouveau_hwmon.h	drm/nouveau/drm/pm: remove everything except the hwmon interfaces to THERM	2013-11-08 15:40:00 +10:00
nouveau_ioc32.c	drm/nouveau: fix up 32-bit ioctls and device wake up.	2013-09-02 09:52:55 +10:00
nouveau_ioctl.h	drm/nouveau: fix up 32-bit ioctls and device wake up.	2013-09-02 09:52:55 +10:00
nouveau_prime.c	drm/nouveau: embed gem object in nouveau_bo	2013-10-09 14:37:55 +10:00
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	drm/nouveau: implement a simple sysfs interface to new pm code	2013-11-08 15:40:18 +10:00
nouveau_sysfs.h	drm/nouveau: implement a simple sysfs interface to new pm code	2013-11-08 15:40:18 +10:00
nouveau_ttm.c	drm: init TTM dev_mapping in ttm_bo_device_init()	2014-03-16 12:23:42 +01:00
nouveau_ttm.h
nouveau_vga.c	drm/nv4c/vga: decode register is in a different place on nv4x igp's	2014-02-18 10:36:49 +10:00
nouveau_vga.h
nv04_fbcon.c	drm/nv11-: synchronise flips to vblank, unless async flip requested	2013-11-14 14:56:56 +10:00
nv04_fence.c
nv10_fence.c
nv10_fence.h
nv17_fence.c
nv50_display.c	drm/nv50: fill in crtc mode struct members from crtc_mode_fixup	2014-01-30 08:18:26 +10:00
nv50_display.h
nv50_fbcon.c
nv50_fence.c
nv84_fence.c
nvc0_fbcon.c
nvc0_fence.c