From: Linus Torvalds Date: Fri, 25 Feb 2011 01:08:48 +0000 (-0800) Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=4662db446190ddef8fbab024f72dee77dd04b8f2;p=linux-beck.git Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/i915: Fix unintended recursion in ironlake_disable_rc6 drm/i915: fix corruptions on i8xx due to relaxed fencing drm/i915: skip FDI & PCH enabling for DP_A agp/intel: Experiment with a 855GM GWB bit drm/i915: don't enable FDI & transcoder interrupts after all drm/i915: Ignore a hung GPU when flushing the framebuffer prior to a switch --- 4662db446190ddef8fbab024f72dee77dd04b8f2