Merge branch 'modesetting-101' of git+ssh://git.freedesktop.org/git/mesa/drm into...
authorJesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Thu, 12 Apr 2007 03:41:54 +0000 (20:41 -0700)
committerJesse Barnes <jbarnes@hobbes.virtuousgeek.org>
Thu, 12 Apr 2007 03:41:54 +0000 (20:41 -0700)
1  2 
shared-core/i915_init.c

Simple merge