Merge branch 'drm-intel-next' of ../anholt-2.6 into drm-linus
authorDave Airlie <airlied@redhat.com>
Fri, 3 Apr 2009 00:27:21 +0000 (10:27 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 3 Apr 2009 00:27:21 +0000 (10:27 +1000)
1  2 
drivers/gpu/drm/i915/i915_dma.c

Simple merge