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)
commitbed8cad9593974a46de5c8aa3d2ee7c49c17182f
tree88ece6a6eb7ad750286ba9d8ab1037578429a234
parent5ccc38740a283aba81a00e92941310d0c1aeb2ee
parentb095cd0a0ccdbc00c9fd99d90b22f8563687971f
Merge branch 'for-linus' of git://git./linux/kernel/git/jbarnes/drm-intel

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