Merge branch 'origin' into modesetting-101
authorDave Airlie <airlied@airlied2.(none)>
Wed, 18 Apr 2007 04:11:49 +0000 (14:11 +1000)
committerDave Airlie <airlied@airlied2.(none)>
Wed, 18 Apr 2007 04:11:49 +0000 (14:11 +1000)
commite46e028bd21552331ca4db409c2b45e54491ced6
treebb80819c26bbfd9d6d7bcb92a216627b2b30e095
parentc71c44bb9288e0bf1b319ec19a2e25f4467d9583
parent5a96d59ce9d9ad5816e2d0e195afa9902445f594
Merge branch 'origin' into modesetting-101

Conflicts:

linux-core/drm_bo.c

Merge in changes from master from Thomas fixiing TTM problems
linux-core/drm_bo.c