Merge branch 'drm-gem'
authorEric Anholt <eric@anholt.net>
Fri, 8 Aug 2008 21:05:01 +0000 (14:05 -0700)
committerEric Anholt <eric@anholt.net>
Fri, 8 Aug 2008 21:05:01 +0000 (14:05 -0700)
commite1b8e79796b172c356af98eb49107c8abbebfe5a
tree4af674ca495ca93535f057ea4c0385c57825c2e4
parent0c47151a571827905c34649208e22f8ec0175d62
parent46e9274e8538e5b0517f611dca99dde611f4e95d
Merge branch 'drm-gem'

Conflicts:

shared-core/i915_dma.c

This brings in kernel support and userland interface for intel GEM.
linux-core/drm_compat.h
linux-core/i915_drv.c
linux-core/i915_opregion.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c