tree ccbf74a5ba9f76bcf9070deb12e527f2ddfbb509
parent 0f181328287db30671e9997329cff71395d4af8b
parent f29ce72795bf335553ab972606bc576b5473995e
author Linus Torvalds <torvalds@linux-foundation.org> 1242257443 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1242257443 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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