Merge branch 'drm-gem' into modesetting-gem
authorJesse Barnes <jbarnes@virtuousgeek.org>
Thu, 7 Aug 2008 21:02:04 +0000 (14:02 -0700)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Thu, 7 Aug 2008 21:02:04 +0000 (14:02 -0700)
commitc7fb19e9b074281f143b0e1c9d054ebcf5ff1091
tree527ab0858bcc97bf99b21538d1dd5399cfab7066
parent086716c8e2516dd71e94ebda03e20943188a5e5e
parentac20e14d2361160cf199dc31c3fe1ffbacdf5bb7
Merge branch 'drm-gem' into modesetting-gem
linux-core/i915_gem.c