| commit | fafc9929c668f8bae6dd1f109f33a86d2cb3c460 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 28 13:14:02 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Apr 28 13:14:02 2011 -0700 |
| tree | ea9739877f8d4107c8a36683e248595cedb1e738 | |
| parent | 0dee0e7fbf446b02125a67f7dfe9415880d6564e [diff] | |
| parent | e8e7a2b8ccfdae0d4cb6bd25824bbedcd42da316 [diff] |
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