tree 457b129a39a3babdc2b0bb497e90915bfddcb12b
parent b91da88fed84843313a1b6fd1b1c834a24bbcf9e
parent e28f87116503f796aba4fb27d81e2c3d81966174
author Linus Torvalds <torvalds@linux-foundation.org> 1311271638 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1311271638 -0700

Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/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