diff options
| author | Eric Anholt <eric@anholt.net> | 2008-08-08 14:05:01 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2008-08-08 14:05:01 -0700 |
| commit | e1b8e79796b172c356af98eb49107c8abbebfe5a (patch) | |
| tree | 4af674ca495ca93535f057ea4c0385c57825c2e4 /linux-core/xgi_ioc32.c | |
| parent | 0c47151a571827905c34649208e22f8ec0175d62 (diff) | |
| parent | 46e9274e8538e5b0517f611dca99dde611f4e95d (diff) | |
Merge branch 'drm-gem'
Conflicts:
shared-core/i915_dma.c
This brings in kernel support and userland interface for intel GEM.
Diffstat (limited to 'linux-core/xgi_ioc32.c')
0 files changed, 0 insertions, 0 deletions