Eric Anholt 2bd34f6ca8 Merge remote branch 'origin/master' into drm-intel-next ...

This resolves the conflict in the EDP code, which has been rather
popular to hack on recently.

Conflicts:
	drivers/gpu/drm/i915/intel_dp.c

2010-08-01 19:34:47 -07:00

..

agp.h

agp/intel: introduce intel-agp.h header file

2010-04-18 17:33:02 -07: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

agp: amd64, fix pci reference leaks

2010-05-26 12:54:39 +10:00

amd-k7-agp.c

agp: use scratch page on memory remove and at GATT creation V4

2010-04-23 13:59:18 +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

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.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/intel: introduce intel-agp.h header file

2010-04-18 17:33:02 -07:00

frontend.c

agp: Remove the BKL from agp_open

2009-10-14 17:36:54 +02:00

generic.c

agp: add no warn since we have a fallback to vmalloc paths

2010-06-15 11:02:32 +10: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

agp: kill phys_to_gart() and gart_to_phys()

2009-08-03 09:05:00 +01:00

intel-agp.c

agp/intel: Support the extended physical addressing bits on Sandybridge.

2010-08-01 19:03:48 -07:00

intel-agp.h

agp/intel: Add actual definitions of the Sandybridge PTE caching bits.

2010-08-01 19:03:48 -07:00

intel-gtt.c

Merge remote branch 'origin/master' into drm-intel-next

2010-08-01 19:34:47 -07:00

isoch.c

agp: use dev_printk when possible

2008-08-12 10:13:38 +10:00

Kconfig

x86, k8 nb: Fix boot crash: enable k8_northbridges unconditionally on AMD systems

2010-03-13 08:36:16 +01:00

Makefile

[AGPGART] Fix modular agpgart ia64 allmodconfig

2007-02-20 14:18:01 -05: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