diff options
| author | Dave Airlie <airlied@airlied2.(none)> | 2007-04-18 14:11:49 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@airlied2.(none)> | 2007-04-18 14:11:49 +1000 |
| commit | e46e028bd21552331ca4db409c2b45e54491ced6 (patch) | |
| tree | bb80819c26bbfd9d6d7bcb92a216627b2b30e095 /shared-core/sis_mm.c | |
| parent | c71c44bb9288e0bf1b319ec19a2e25f4467d9583 (diff) | |
| parent | 5a96d59ce9d9ad5816e2d0e195afa9902445f594 (diff) | |
Merge branch 'origin' into modesetting-101
Conflicts:
linux-core/drm_bo.c
Merge in changes from master from Thomas fixiing TTM problems
Diffstat (limited to 'shared-core/sis_mm.c')
0 files changed, 0 insertions, 0 deletions