Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keith...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jul 2011 18:07:18 +0000 (11:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jul 2011 18:07:18 +0000 (11:07 -0700)
commitad21b115772dfa146f19ec5d1db9de25973c483b
tree457b129a39a3babdc2b0bb497e90915bfddcb12b
parentb91da88fed84843313a1b6fd1b1c834a24bbcf9e
parente28f87116503f796aba4fb27d81e2c3d81966174
Merge branch 'drm-intel-fixes' of git://git./linux/kernel/git/keithp/linux-2.6

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6:
  drm/i915: Fix unfenced alignment on pre-G33 hardware
  drm/i915: Add quirk to disable SSC on Lenovo U160 LVDS