summaryrefslogtreecommitdiff
path: root/bsd-core
diff options
context:
space:
mode:
authorJerome Glisse <glisse@freedesktop.org>2007-10-28 00:55:27 +0200
committerJerome Glisse <glisse@freedesktop.org>2007-10-28 00:55:27 +0200
commit90d8f792794d46d1a8e998856bc7bbe54596114b (patch)
treeb44d6ad311127ae44457635f3e59e51290a3838a /bsd-core
parent343696583c77983ac7689b24cd49529864035cf7 (diff)
parent89d44a1023543a95b429bf72662b5e2308b0a550 (diff)
Merge branch 'radeon-ttm' of git://people.freedesktop.org/~airlied/drm into modesetting-101
Conflicts: linux-core/Makefile.kernel linux-core/drmP.h shared-core/radeon_cp.c shared-core/radeon_drv.h shared-core/radeon_irq.c modified: linux-core/Makefile.kernel modified: linux-core/ati_pcigart.c modified: linux-core/drmP.h new file: linux-core/radeon_buffer.c modified: linux-core/radeon_drv.c new file: linux-core/radeon_fence.c modified: shared-core/radeon_cp.c modified: shared-core/radeon_drm.h modified: shared-core/radeon_drv.h modified: shared-core/radeon_irq.c modified: tests/ttmtest/src/ttmtest.c
Diffstat (limited to 'bsd-core')
0 files changed, 0 insertions, 0 deletions