diff options
| author | Jesse Barnes <jbarnes@jbarnes-t61.(none)> | 2008-06-18 15:25:54 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-06-18 15:25:54 -0700 |
| commit | 86accbcb344ff25fbb47a788bb0f7464b5cd797f (patch) | |
| tree | d023b852e7dab469bcc1d2b7f37493709e657fe5 /linux-core/drm_ioctl.c | |
| parent | c843d47b906e57fb3002af4a609d3cb95c5e195d (diff) | |
| parent | e7424e4580159b0ac3e232674dff5c862e851dff (diff) | |
Merge commit 'origin/drm-gem' into modesetting-gem
Lots of conflicts, seems to load ok, but I'm sure some bugs snuck in.
Conflicts:
linux-core/drmP.h
linux-core/drm_lock.c
linux-core/i915_gem.c
shared-core/drm.h
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Diffstat (limited to 'linux-core/drm_ioctl.c')
0 files changed, 0 insertions, 0 deletions