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)
commit5f3dbedf2770cf6aeb5547b3c56734dee4e5186b
treee4930f7f4fe27b06079d2df8072a2bdf6457c666
parent7a1fb5d06d3936c0982e2cf8b53b046244a9aad6
parent1055f9ddad093f54dfd708a0f976582034d4ce1a
Merge branch 'drm-intel-next' of ../anholt-2.6 into drm-linus
drivers/gpu/drm/i915/i915_dma.c