Daniel Vetter 967ad7f148 Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next ... The conflict in intel_drv.h tripped me up a bit since a patch in dinq moves all the functions around, but another one in drm-next removes a single function. So I'ev figured backing this into a backmerge would be good. i915_dma.c is just adjacent lines changed, nothing nefarious there. Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/intel_drv.h Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2013-10-10 12:44:43 +02:00
..
arb.c	drm: Remove pci_vendor and pci_device from struct drm_device	2013-10-09 15:55:33 +10:00
crtc.c	drm: Remove clock_index from struct drm_display_mode	2013-10-01 07:45:34 +02:00
cursor.c
dac.c
dfp.c	drm: Remove pci_vendor and pci_device from struct drm_device	2013-10-09 15:55:33 +10:00
disp.c
disp.h	drm: Remove pci_vendor and pci_device from struct drm_device	2013-10-09 15:55:33 +10:00
hw.c	drm: Remove pci_vendor and pci_device from struct drm_device	2013-10-09 15:55:33 +10:00
hw.h
Makefile
nvreg.h
tvmodesnv17.c
tvnv04.c
tvnv17.c
tvnv17.h