Merge branch 'master' into modesetting-101
authorDave Airlie <airlied@linux.ie>
Thu, 15 Nov 2007 04:04:19 +0000 (15:04 +1100)
committerDave Airlie <airlied@linux.ie>
Thu, 15 Nov 2007 04:04:19 +0000 (15:04 +1100)
commitf0fe478c1587780690edc465d957a762e02acc8a
treede129251264e7c4fa5c8c7119583dc18af9a3fab
parente1bc147ac9aa8ac2ac271b0a21f4138b17875ce5
parent62cdc6dbb3545d21bc3a68987d0781f277ae6ee4
Merge branch 'master' into modesetting-101

Conflicts:

shared-core/i915_dma.c
tests/ttmtest/src/ttmtest.c
linux-core/drmP.h
linux-core/i915_drv.c