diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-03-07 12:32:44 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-03-07 12:35:15 +0000 |
| commit | 47ae63e0c2e5fdb582d471dc906eb29be94c732f (patch) | |
| tree | f5aceffc0bc82c8cc4d5e96ef73280b018a6f333 /arch/arm/mach-omap1/lcd_dma.c | |
| parent | c59a333f73868ca6fbcecea99b3542e2c62a3a5c (diff) | |
| parent | 467cffba85791cdfce38c124d75bd578f4bb8625 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Apply the trivial conflicting regression fixes, but keep GPU semaphores
enabled.
Conflicts:
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_gem_execbuffer.c
Diffstat (limited to 'arch/arm/mach-omap1/lcd_dma.c')
0 files changed, 0 insertions, 0 deletions