Merge head 'drm-3264' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Linus Torvalds [Sat, 9 Jul 2005 16:58:47 +0000 (09:58 -0700)]
1  2 
drivers/char/drm/Makefile

Simple merge