diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-11-15 15:04:19 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-11-15 15:04:19 +1100 |
| commit | f0fe478c1587780690edc465d957a762e02acc8a (patch) | |
| tree | de129251264e7c4fa5c8c7119583dc18af9a3fab /linux-core/mga_dma.c | |
| parent | e1bc147ac9aa8ac2ac271b0a21f4138b17875ce5 (diff) | |
| parent | 62cdc6dbb3545d21bc3a68987d0781f277ae6ee4 (diff) | |
Merge branch 'master' into modesetting-101
Conflicts:
shared-core/i915_dma.c
tests/ttmtest/src/ttmtest.c
Diffstat (limited to 'linux-core/mga_dma.c')
0 files changed, 0 insertions, 0 deletions