Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Wed, 29 Jun 2011 20:47:53 +0000 (13:47 -0700)
committerKeith Packard <keithp@keithp.com>
Wed, 29 Jun 2011 20:47:53 +0000 (13:47 -0700)
commite489bda422b0a2c2cc33e598a4d400dfe654ad64
tree0f055735666904294bee29027f75575e710aeab8
parent1c70c0cebd1295a42fec75045b8a6b4419cedef3
parentdc501fbc4389f6c15a8da14684b5926e0d9553da
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_suspend.c