Merge branch 'drm-intel-fixes' into drm-intel-next
authorKeith Packard <keithp@keithp.com>
Fri, 1 Jul 2011 20:33:49 +0000 (13:33 -0700)
committerKeith Packard <keithp@keithp.com>
Fri, 1 Jul 2011 20:33:49 +0000 (13:33 -0700)
commita7f08958d7ca69e26ec85fe49c0be3568a565493
tree9dab29e11c967211cb8b9bd5c45bee8cd75c723a
parentbee4d4acf563f91a7796cca53111d91be2532935
parent2b1ecb7337592a7bf0989efac46a5b52daab769e
Merge branch 'drm-intel-fixes' into drm-intel-next
drivers/gpu/drm/i915/i915_irq.c