From: Daniel Vetter Date: Fri, 17 Aug 2012 06:57:56 +0000 (+0200) Subject: Merge tag 'v3.6-rc2' into drm-intel-next X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~20^2~61^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a22ddff8bedfe33eeb1330bbb7ef1fbe007a42c4;p=pandora-kernel.git Merge tag 'v3.6-rc2' into drm-intel-next Backmerge Linux 3.6-rc2 to resolve a few funny conflicts before we put even more madness on top: - drivers/gpu/drm/i915/i915_irq.c: Just a spurious WARN removed in -fixes, that has been changed in a variable-rename in -next, too. - drivers/gpu/drm/i915/intel_ringbuffer.c: -next remove scratch_addr (since all their users have been extracted in another fucntion), -fixes added another user for a hw workaroudn. Signed-off-by: Daniel Vetter --- a22ddff8bedfe33eeb1330bbb7ef1fbe007a42c4 Reading git-diff-tree failed