From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 7 Jan 2009 02:06:44 +0000 (-0800)
Subject: Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=c89a9f5a42811aa5b2f258e32750c0109f570fc1;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'drm-next' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm: fix ordering of driver unload vs agp unload.
  drm/i915: Respect the other stolen memory sizes we know of.
  drm/i915: Non-mobile parts don't have integrated TV-out.
  drm/i915: Add support for integrated HDMI on G4X hardware.
  drm/i915: Pin cursor bo and unpin old bo when setting cursor.
  drm/i915: Don't allow objects to get bound while VT switched.
---

c89a9f5a42811aa5b2f258e32750c0109f570fc1