diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-07-07 15:43:43 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2008-07-07 15:43:43 -0400 |
| commit | 3e02f7fd310ae062d250d8db01ddc3b7de3d7943 (patch) | |
| tree | cfce44b02b989ad9d7bf2a497e49743e15d77168 /shared-core/nouveau_object.c | |
| parent | 7fd8a5de63781f6faa053509c80e02e8f1cdbb69 (diff) | |
| parent | d250a55fc6a726a8bfaf4f871eeb09c895a9ba51 (diff) | |
Merge commit 'origin/drm-gem' into ms-gem
Conflicts:
linux-core/drmP.h
linux-core/drm_drv.c
linux-core/drm_stub.c
linux-core/i915_drv.c
linux-core/i915_gem.c
shared-core/i915_drv.h
shared-core/i915_irq.c
Diffstat (limited to 'shared-core/nouveau_object.c')
0 files changed, 0 insertions, 0 deletions