Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Wed, 28 Sep 2011 21:44:38 +0000 (14:44 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 28 Sep 2011 21:44:38 +0000 (14:44 -0700)
commit0ac225e56997ef89f46eb51b02799a685b78f214
tree9a7694b8748c08b5c74ab07b4df6d53defd8216f
parent64a742fac3a22f57303d8f1b7e347350a1c48254
parentcd0de039bff32ee314046c0e4c047c38aa696f84
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_sdvo.c