]> www.infradead.org Git - users/hch/dma-mapping.git/commitdiff
projects / users / hch / dma-mapping.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4cda1fd 8ca7c1d)
Merge head 'drm-3264' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sat, 9 Jul 2005 16:58:47 +0000 (09:58 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sat, 9 Jul 2005 16:58:47 +0000 (09:58 -0700)
1  2 
drivers/char/drm/Makefile patch | diff1 | diff2 | blob | history

diff --cc drivers/char/drm/Makefile
Simple merge
Unnamed repository; edit this file 'description' to name the repository.