Linus Torvalds c48c43e422 Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 ... * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (476 commits) vmwgfx: Implement a proper GMR eviction mechanism drm/radeon/kms: fix r6xx/7xx 1D tiling CS checker v2 drm/radeon/kms: properly compute group_size on 6xx/7xx drm/radeon/kms: fix 2D tile height alignment in the r600 CS checker drm/radeon/kms/evergreen: set the clear state to the blit state drm/radeon/kms: don't poll dac load detect. gpu: Add Intel GMA500(Poulsbo) Stub Driver drm/radeon/kms: MC vram map needs to be >= pci aperture size drm/radeon/kms: implement display watermark support for evergreen drm/radeon/kms/evergreen: add some additional safe regs v2 drm/radeon/r600: fix tiling issues in CS checker. drm/i915: Move gpu_write_list to per-ring drm/i915: Invalidate the to-ring, flush the old-ring when updating domains drm/i915/ringbuffer: Write the value passed in to the tail register agp/intel: Restore valid PTE bit for Sandybridge after bdd3072 drm/i915: Fix flushing regression from 9af90d19f drm/i915/sdvo: Remove unused encoding member i915: enable AVI infoframe for intel_hdmi.c [v4] drm/i915: Fix current fb blocking for page flip drm/i915: IS_IRONLAKE is synonymous with gen == 5 ... Fix up conflicts in - drivers/gpu/drm/i915/{i915_gem.c, i915/intel_overlay.c}: due to the new simplified stack-based kmap_atomic() interface - drivers/gpu/drm/vmwgfx/vmwgfx_drv.c: added .llseek entry due to BKL removal cleanups.		2010-10-26 18:57:59 -07:00
..
agp.h	agp: kill agp_(unmap|map)_memory	2010-09-21 11:39:52 +01:00
ali-agp.c	agp: use scratch page on memory remove and at GATT creation V4	2010-04-23 13:59:18 +10:00
alpha-agp.c	const: mark struct vm_struct_operations	2009-09-27 11:39:25 -07:00
amd64-agp.c	Merge branch 'x86-amd-nb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-10-21 13:01:08 -07:00
amd-k7-agp.c	agp/amd-k7: Allow binding user memory to the AGP GART.	2010-10-19 14:12:32 +10:00
ati-agp.c	agp: use scratch page on memory remove and at GATT creation V4	2010-04-23 13:59:18 +10:00
backend.c	agp: kill agp_(map|unmap)_page	2010-09-21 11:36:11 +01:00
compat_ioctl.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
compat_ioctl.h	agp: add chipset flushing support to AGP interface	2008-02-05 14:33:32 +10:00
efficeon-agp.c	agp: efficeon-agp: do not use PCI resources before pci_enable_device()	2010-08-05 12:28:21 +10:00
frontend.c	agp: Remove the BKL from agp_open	2009-10-14 17:36:54 +02:00
generic.c	Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6	2010-10-26 18:57:59 -07:00
hp-agp.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
i460-agp.c	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
intel-agp.c	agp/intel: Also add B43.1 to list of supported devices	2010-10-19 09:20:04 +01:00
intel-agp.h	Merge branch 'drm-intel-fixes' into HEAD	2010-09-21 11:19:32 +01:00
intel-gtt.c	agp/intel: Restore valid PTE bit for Sandybridge after bdd3072	2010-10-22 15:04:09 +01:00
isoch.c	agp: use dev_printk when possible	2008-08-12 10:13:38 +10:00
Kconfig	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2010-10-24 13:41:39 -07:00
Makefile	agp/intel: make intel-gtt.c into a real source file	2010-09-08 21:20:06 +01:00
nvidia-agp.c	agp: use scratch page on memory remove and at GATT creation V4	2010-04-23 13:59:18 +10:00
parisc-agp.c	agp: parisc-agp.c - use correct page_mask function	2009-10-03 01:27:56 -04:00
sgi-agp.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
sis-agp.c	sis-agp: Remove SIS 760, handled by amd64-agp	2010-05-19 10:11:23 +10: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: Fix oops caused by flushing too much	2010-06-02 17:50:37 +10:00
via-agp.c	agp: use scratch page on memory remove and at GATT creation V4	2010-04-23 13:59:18 +10:00