Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Aug 2011 06:07:08 +0000 (23:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Aug 2011 06:07:08 +0000 (23:07 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/drm-intel:
  drm/i915: set GFX_MODE to pre-Ivybridge default value even on Ivybridge


Trivial merge