Daniel Vetter ca6e440577 Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued ... Backmerge fixes since it's getting out of hand again with the massive split due to atomic between -next and 4.2-rc. All the bugfixes in 4.2-rc are addressed already (by converting more towards atomic instead of minimal duct-tape) so just always pick the version in next for the conflicts in modeset code. All the other conflicts are just adjacent lines changed. Conflicts: drivers/gpu/drm/i915/i915_drv.h drivers/gpu/drm/i915/i915_gem_gtt.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_drv.h drivers/gpu/drm/i915/intel_ringbuffer.h Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>		2015-07-15 16:36:50 +02:00
..
agp.h	agp: change agp_free_page_array to use kvfree	2015-01-29 12:37:41 +10:00
ali-agp.c	agp: Fix up email address & attributions in AGP MODULE_AUTHOR tags	2014-12-23 20:03:10 +10:00
alpha-agp.c	PCI: Convert alloc_pci_dev(void) to pci_alloc_dev(bus)	2013-06-05 13:49:36 -06:00
amd64-agp.c	agp: Fix up email address & attributions in AGP MODULE_AUTHOR tags	2014-12-23 20:03:10 +10:00
amd-k7-agp.c	agp: Use pci_resource_start() to get CPU physical address for BAR	2014-01-07 11:36:35 -07:00
ati-agp.c	agp: Fix up email address & attributions in AGP MODULE_AUTHOR tags	2014-12-23 20:03:10 +10:00
backend.c	agp: Fix up email address & attributions in AGP MODULE_AUTHOR tags	2014-12-23 20:03:10 +10:00
compat_ioctl.c	agp: kill agp_flush_chipset and corresponding ioctl	2010-11-23 20:14:45 +00:00
compat_ioctl.h	agp: kill agp_flush_chipset and corresponding ioctl	2010-11-23 20:14:45 +00:00
efficeon-agp.c	agp: Support 64-bit APBASE	2014-01-06 17:49:22 -07:00
frontend.c	agp: remove read/write stubs	2014-08-02 06:43:51 +10:00
generic.c	agp: change agp_free_page_array to use kvfree	2015-01-29 12:37:41 +10:00
hp-agp.c	[IA64] agp/hp-agp: Allow binding user memory to the AGP GART	2011-08-23 13:31:59 -07:00
i460-agp.c	Drivers: char: remove __dev* attributes.	2013-01-03 15:57:15 -08:00
intel-agp.c	agp: Fix up email address & attributions in AGP MODULE_AUTHOR tags	2014-12-23 20:03:10 +10:00
intel-agp.h	agp/intel: Use pci_bus_address() to get GTTADR bus address	2014-01-07 11:37:12 -07:00
intel-gtt.c	Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued	2015-07-15 16:36:50 +02:00
isoch.c	agp: use dev_printk when possible	2008-08-12 10:13:38 +10:00
Kconfig	drm/i915: Make AGP support optional	2013-11-08 18:37:32 +01:00
Makefile	drm/i915: Make AGP support optional	2013-11-08 18:37:32 +01:00
nvidia-agp.c	agp: Fix up email address & attributions in AGP MODULE_AUTHOR tags	2014-12-23 20:03:10 +10:00
parisc-agp.c	parisc: agp/parisc-agp: allow binding of user memory to the AGP GART	2013-07-31 23:42:00 +02:00
sgi-agp.c	drivers/char: delete non-required instances of include <linux/init.h>	2014-02-07 15:10:19 -08:00
sis-agp.c	agp: Support 64-bit APBASE	2014-01-06 17:49:22 -07:00
sworks-agp.c	Drivers: char: remove __dev* attributes.	2013-01-03 15:57:15 -08:00
uninorth-agp.c	Drivers: char: remove __dev* attributes.	2013-01-03 15:57:15 -08:00
via-agp.c	agp: Fix up email address & attributions in AGP MODULE_AUTHOR tags	2014-12-23 20:03:10 +10:00