Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle...
authorDave Airlie <airlied@redhat.com>
Thu, 24 Feb 2011 02:19:43 +0000 (12:19 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 24 Feb 2011 02:19:43 +0000 (12:19 +1000)
commitfbf92bea68830c12da9099d7c8a60812194efc4e
tree110e2c2476ac98ae298b90881de1fd015ff33739
parentef3242859fae47e728b50b7ce3d17b201a71779a
parentc2e0eb167070a6e9dcb49c84c13c79a30d672431
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