Jesse Barnes
|
9583c099b4
|
Revert "Merge branch 'modesetting-gem'"
This reverts commit 6656db1055.
We really just want the libdrm and ioctl bits, not all the driver
stuff.
|
2008-12-10 15:50:22 -08:00 |
Kristian Høgsberg
|
086716c8e2
|
Merge commit 'origin/drm-gem' into modesetting-gem
Conflicts:
linux-core/Makefile.kernel
linux-core/drmP.h
linux-core/drm_mm.c
linux-core/drm_stub.c
linux-core/i915_gem.c
linux-core/i915_opregion.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
|
2008-08-01 13:35:56 -04:00 |
Eric Anholt
|
1d2bb68d28
|
Merge commit 'origin/master' into drm-gem
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
|
2008-07-28 23:12:26 -07:00 |
|
Eric Anholt
|
487c42bd42
|
intel-gem: Another checkpatch.pl pass.
|
2008-07-28 11:45:22 -07:00 |
|
Eric Anholt
|
a5d8f35f0f
|
intel-gem: Move /proc debugging to a separate file.
|
2008-07-23 10:10:44 -07:00 |