Merge remote branch 'origin/modesetting-101' into modesetting-101
authorAlan Hourihane <alanh@fairlite.demon.co.uk>
Thu, 12 Apr 2007 14:10:08 +0000 (15:10 +0100)
committerAlan Hourihane <alanh@fairlite.demon.co.uk>
Thu, 12 Apr 2007 14:10:08 +0000 (15:10 +0100)
1  2 
linux-core/drmP.h
shared-core/i915_dma.c

Simple merge
Simple merge