Daniel Vetter 7b0cfee1a2 Linux 3.5-rc4 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJP53AxAAoJEHm+PkMAQRiGs2QH/RaqkXz96fwjhDcyiKpDqA3c kGuS5mz5cOhnqKSmR88HFm6pwuhLux/qSJzeAmoQy1MC8a0ACx7AnANW0lfN3/qe /HGYz8h60yCL/fhn8/bUYtdt9xsoDqoDcq/ooFl9mcsJGWbC6WeMSZU5dAUYqviE qFrp5zjY07FG53CRGT0hFpezQNwNL+VLH30CF9LD+fJLPVEYum2zBNGXWM42rcw5 fxzGL/6SO8YqA/Upic1ht6HAd6s5LOrlST7qvnyXUMvRXN5z/Y92ueYJZefkS1Om ohuLIKM2bv9/dJS67H8N2baSKGCzBdfSe5/5WaHdLYW9MiVju0wRl6HPJtAMrkk= =H8t8 -----END PGP SIGNATURE----- Merge tag 'v3.5-rc4' into drm-intel-next-queued I want to merge the "no more fake agp on gen6+" patches into drm-intel-next (well, the last pieces). But a patch in 3.5-rc4 also adds a new use of dev->agp. Hence the backmarge to sort this out, for otherwise drm-intel-next merged into Linus' tree would conflict in the relevant code, things would compile but nicely OOPS at driver load :( Conflicts in this merge are just simple cases of "both branches changed/added lines at the same place". The only tricky part is to keep the order correct wrt the unwind code in case of errors in intel_ringbuffer.c (and the MI_DISPLAY_FLIP #defines in i915_reg.h together, obviously). Conflicts: drivers/gpu/drm/i915/i915_reg.h drivers/gpu/drm/i915/intel_ringbuffer.c Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2012-06-25 19:10:36 +02:00
..
agp.h
ali-agp.c
alpha-agp.c
amd-k7-agp.c
amd64-agp.c
ati-agp.c
backend.c
compat_ioctl.c
compat_ioctl.h
efficeon-agp.c
frontend.c
generic.c
hp-agp.c
i460-agp.c
intel-agp.c	Linux 3.5-rc4	2012-06-25 19:10:36 +02:00
intel-agp.h	Linux 3.5-rc4	2012-06-25 19:10:36 +02:00
intel-gtt.c	agp/intel: use correct GTT offset on VLV	2012-06-20 22:49:46 +02:00
isoch.c
Kconfig
Makefile
nvidia-agp.c
parisc-agp.c
sgi-agp.c
sis-agp.c
sworks-agp.c
uninorth-agp.c
via-agp.c