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)
commitcc14cf46da215a9df1c0a4388763a68769ef9e53
treef9add6f7ae53b4155a22fd8afc20c847fda021fb
parent4cda1fd78781c31e2a3d9dd87ee05d39cb76b3f9
parent8ca7c1df08210fd35fccf1559837c92baaa4da8f
Merge head 'drm-3264' of /linux/kernel/git/airlied/drm-2.6
drivers/char/drm/Makefile