summaryrefslogtreecommitdiff
path: root/linux-core/sis_mm.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2007-07-12 14:25:29 +1000
committerDave Airlie <airlied@linux.ie>2007-07-12 14:25:29 +1000
commit5c6a23704afa9445a58585ea2b8686b054f4074a (patch)
tree7663e3a7ec51fdfa0d68dd87606d0427760d9bf2 /linux-core/sis_mm.c
parentabf35cbdcf5743c73929ddbe67ed4cae69b32aeb (diff)
Merge branch 'radeon-ttm' of git://people.freedesktop.org/~airlied/drm into radeon-ttm
Conflicts: linux-core/ati_pcigart.c linux-core/drmP.h linux-core/radeon_buffer.c
Diffstat (limited to 'linux-core/sis_mm.c')
0 files changed, 0 insertions, 0 deletions