From: Daniel Vetter Date: Mon, 25 Jun 2012 17:06:12 +0000 (+0200) Subject: Merge tag 'v3.5-rc4' into drm-intel-next-queued X-Git-Tag: v3.6-rc1~83^2~42^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b0cfee1a24efdfe0235bac62e53f686fe8a8e24;p=pandora-kernel.git 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 --- 7b0cfee1a24efdfe0235bac62e53f686fe8a8e24 Reading git-diff-tree failed