From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Jul 2011 18:07:18 +0000 (-0700)
Subject: Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keith... 
X-Git-Tag: firefly_0821_release~3680^2~5025
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ad21b115772dfa146f19ec5d1db9de25973c483b;p=firefly-linux-kernel-4.4.55.git

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

ad21b115772dfa146f19ec5d1db9de25973c483b