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)
1  2 
drivers/gpu/drm/i915/i915_irq.c

Simple merge