From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Apr 2011 20:14:02 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.39-rc6~22
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=fafc9929c668f8bae6dd1f109f33a86d2cb3c460;p=~shefty%2Frdma-dev.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: restore only the mode of this driver on lastclose (v2)
  drm/radeon/kms: add info query for tile pipes
  drm/radeon/kms: add missing safe regs for 6xx/7xx
  drm: select FRAMEBUFFER_CONSOLE_PRIMARY if we have FRAMEBUFFER_CONSOLE
---

fafc9929c668f8bae6dd1f109f33a86d2cb3c460