diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-13 16:30:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-05-13 16:30:43 -0700 |
| commit | 0a40a55fd1fde3875769025ee8a4a7059c7a042d (patch) | |
| tree | ccbf74a5ba9f76bcf9070deb12e527f2ddfbb509 /drivers/infiniband | |
| 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
Diffstat (limited to 'drivers/infiniband')
0 files changed, 0 insertions, 0 deletions