From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 13 May 2009 23:30:43 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes... 
X-Git-Tag: v2.6.30-rc6~21
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=0a40a55fd1fde3875769025ee8a4a7059c7a042d;p=~shefty%2Frdma-dev.git

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
---

0a40a55fd1fde3875769025ee8a4a7059c7a042d