| commit | 0a40a55fd1fde3875769025ee8a4a7059c7a042d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 13 16:30:43 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 13 16:30:43 2009 -0700 |
| tree | ccbf74a5ba9f76bcf9070deb12e527f2ddfbb509 | |
| parent | 0f181328287db30671e9997329cff71395d4af8b [diff] | |
| parent | f29ce72795bf335553ab972606bc576b5473995e [diff] |
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