Merge remote branch 'origin/master' of /home/airlied/kernel//linux-2.6 into drm-core...
authorDave Airlie <airlied@redhat.com>
Fri, 24 Sep 2010 05:37:33 +0000 (15:37 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 24 Sep 2010 05:37:33 +0000 (15:37 +1000)
1  2 
drivers/gpu/drm/i915/i915_drv.c

Simple merge