From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 30 Nov 2008 21:00:21 +0000 (-0800)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8639dad84e4fe83577006e8e2bd9da79c6c2c41e;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'drm-fixes' of git://git./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: Save/restore HWS_PGA on suspend/resume
  drm: move drm vblank initialization/cleanup to driver load/unload
  drm/i915: execbuffer pins objects, no need to ensure they're still in the GTT
  drm/i915: Always read pipestat in irq_handler
  drm/i915: Subtract total pinned bytes from available aperture size
  drm/i915: Avoid BUG_ONs on VT switch with a wedged chipset.
  drm/i915: Remove IMR masking during interrupt handler, and restart it if needed.
  drm/i915: Manage PIPESTAT to control vblank interrupts instead of IMR.
---

8639dad84e4fe83577006e8e2bd9da79c6c2c41e