diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-17 14:28:50 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-17 14:28:50 -0700 |
commit | 13bd8e4673d527a9e48f41956b11d391e7c2cfe0 (patch) | |
tree | 2a3ce7c025f7d5b771fcc9a24b88a49317b2c7bc /drivers/gpu/drm/Makefile | |
parent | d6f533c8c7a4d83ed1c075f919a68031b9c67185 (diff) | |
parent | bfac4d6725baacbfc085c38e231b8582a1b8f62b (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
drm/i915: Ignore LVDS EDID when it is unavailabe or invalid
drm/i915: Add no_lvds entry for the Clientron U800
drm/i915: Rename many remaining uses of "output" to encoder or connector.
drm/i915: Rename intel_output to intel_encoder.
agp/intel: intel_845_driver is an agp driver!
drm/i915: introduce to_intel_bo helper
drm/i915: Disable FBC on 915GM and 945GM.
Diffstat (limited to 'drivers/gpu/drm/Makefile')
0 files changed, 0 insertions, 0 deletions