Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
commit0a40a55fd1fde3875769025ee8a4a7059c7a042d
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 May 2009 23:30:43 +0000 (13 16:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 May 2009 23:30:43 +0000 (13 16:30 -0700)
treeccbf74a5ba9f76bcf9070deb12e527f2ddfbb509
parent0f181328287db30671e9997329cff71395d4af8b
parentf29ce72795bf335553ab972606bc576b5473995e
Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/drm-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-2.6:
  drm/i915: automatically select FRAMEBUFFER_CONSOLE if !EMBEDDED