Merge branch 'origin' into modesetting-101
authorDave Airlie <airlied@linux.ie>
Thu, 26 Apr 2007 05:56:21 +0000 (15:56 +1000)
committerDave Airlie <airlied@linux.ie>
Thu, 26 Apr 2007 05:56:21 +0000 (15:56 +1000)
1  2 
linux-core/drmP.h
linux-core/drm_objects.h

Simple merge
Simple merge