Merge commit 'anholt/drm-gem' into drm-gem
authorKeith Packard <keithp@keithp.com>
Mon, 5 May 2008 21:40:20 +0000 (14:40 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 5 May 2008 21:40:20 +0000 (14:40 -0700)
commit5b0d0fa7f81fb297778af97124a2273b2af317bb
tree29e9d8b79f14a250f48218f3a85782e1b9e4583f
parentd59a9300ec2ec5d6dc606f847a7589c197994793
parentdafe48e6239a4e9b49dd87b8c70224e8eeeb6079
Merge commit 'anholt/drm-gem' into drm-gem

Conflicts:

linux-core/i915_gem.c
linux-core/i915_gem.c