From: Daniel Vetter Date: Tue, 24 Sep 2013 07:29:24 +0000 (+0200) Subject: Merge tag 'v3.12-rc2' into drm-intel-next X-Git-Tag: v3.13-rc1~76^2~114^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b599c89e8c5cf0c37352e0871be240291f8ce922;p=pandora-kernel.git Merge tag 'v3.12-rc2' into drm-intel-next Backmerge Linux 3.12-rc2 to prep for a bunch of -next patches: - Header cleanup in intel_drv.h, both changed in -fixes and my current -next pile. - Cursor handling cleanup for -next which depends upon the cursor handling fix merged into -rc2. All just trivial conflicts of the "changed adjacent lines" type: drivers/gpu/drm/i915/i915_gem.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_drv.h Signed-off-by: Daniel Vetter --- b599c89e8c5cf0c37352e0871be240291f8ce922 Reading git-diff-tree failed