Merge branch 'i915-pageflip'
authorMichel Dänzer <michel@tungstengraphics.com>
Fri, 9 Mar 2007 23:11:10 +0000 (00:11 +0100)
committerMichel Dänzer <michel@tungstengraphics.com>
Fri, 9 Mar 2007 23:11:10 +0000 (00:11 +0100)
1  2 
shared-core/drm.h

Simple merge