From: Dave Airlie <airlied@redhat.com>
Date: Thu, 24 Feb 2011 02:19:43 +0000 (+1000)
Subject: Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle... 
X-Git-Tag: v2.6.38-rc7~5^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fbf92bea68830c12da9099d7c8a60812194efc4e;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'drm-intel-fixes' of git://git./linux/kernel/git/ickle/drm-intel into drm-fixes

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
  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
---

fbf92bea68830c12da9099d7c8a60812194efc4e