Linus Torvalds 03a2c4d76c Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 ... * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (151 commits) vga_switcheroo: disable default y by new rules. drm/nouveau: fix *staging* driver build with switcheroo off. drm/radeon: fix typo in Makefile vga_switcheroo: fix build on platforms with no ACPI drm/radeon: Fix printf type warning in 64bit system. drm/radeon/kms: bump the KMS version number for square tiling support. vga_switcheroo: initial implementation (v15) drm/radeon/kms: do not disable audio engine twice Revert "drm/radeon/kms: disable HDMI audio for now on rv710/rv730" drm/radeon/kms: do not preset audio stuff and start timer when not using audio drm/radeon: r100/r200 ums: block ability for userspace app to trash 0 page and beyond drm/ttm: fix function prototype to match implementation drm/radeon: use ALIGN instead of open coding it drm/radeon/kms: initialize set_surface_reg reg for rs600 asic drm/i915: Use a dmi quirk to skip a broken SDVO TV output. drm/i915: enable/disable LVDS port at DPMS time drm/i915: check for multiple write domains in pin_and_relocate drm/i915: clean-up i915_gem_flush_gpu_write_domain drm/i915: reuse i915_gpu_idle helper drm/i915: ensure lru ordering of fence_list ... Fixed trivial conflicts in drivers/gpu/vga/Kconfig		2010-03-04 07:49:37 -08:00
..
agp.h	const: mark struct vm_struct_operations	2009-09-27 11:39:25 -07:00
ali-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
alpha-agp.c	const: mark struct vm_struct_operations	2009-09-27 11:39:25 -07:00
amd64-agp.c	x86/agp: Fix amd64-agp module initialization regression	2010-02-04 07:27:26 +01:00
amd-k7-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
ati-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
backend.c	agp: correct missing cleanup on error in agp_add_bridge	2010-01-11 15:09:01 +10:00
compat_ioctl.c	agp: more boolean conversions.	2008-06-19 10:42:17 +10:00
compat_ioctl.h	agp: add chipset flushing support to AGP interface	2008-02-05 14:33:32 +10:00
efficeon-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
frontend.c	agp: Remove the BKL from agp_open	2009-10-14 17:36:54 +02:00
generic.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
hp-agp.c	agp/hp: fail gracefully if we don't find an IOC	2010-01-11 15:09:02 +10:00
i460-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
intel-agp.c	Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2010-03-04 07:49:37 -08:00
isoch.c	agp: use dev_printk when possible	2008-08-12 10:13:38 +10:00
Kconfig	agp/amd64: Remove GART dependency on AGP_AMD64	2009-10-29 17:29:40 +01:00
Makefile	[AGPGART] Fix modular agpgart ia64 allmodconfig	2007-02-20 14:18:01 -05:00
nvidia-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
parisc-agp.c	agp: parisc-agp.c - use correct page_mask function	2009-10-03 01:27:56 -04:00
sgi-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
sis-agp.c	agp: enable optimized agp_alloc_pages methods	2008-08-22 06:07:33 +02:00
sworks-agp.c	agp: kill phys_to_gart() and gart_to_phys()	2009-08-03 09:05:00 +01:00
uninorth-agp.c	agp/uninorth: Unify U3 and pre-U3 insert_memory and remove_memory hooks.	2009-12-09 17:09:30 +11:00
via-agp.c	Update email addresses.	2008-10-20 12:50:03 -07:00