projects / platform / upstream / libdrm.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: abf35cb) | patch
Merge branch 'radeon-ttm' of git://people.freedesktop.org/~airlied/drm into radeon-ttm
authorDave Airlie <airlied@linux.ie>
Thu, 12 Jul 2007 04:25:29 +0000 (14:25 +1000)
committerDave Airlie <airlied@linux.ie>
Thu, 12 Jul 2007 04:25:29 +0000 (14:25 +1000)
commit5c6a23704afa9445a58585ea2b8686b054f4074a
tree7663e3a7ec51fdfa0d68dd87606d0427760d9bf2tree | snapshot
parentabf35cbdcf5743c73929ddbe67ed4cae69b32aebcommit | 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
linux-core/drmP.h diff | blob | history
Domain: System / Kernel;