Merge branch 'upstream-fixes' into upstream
[linux-2.6] / drivers / char / drm / Kconfig
2005-06-27  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-27  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-06-26  Jeff GarzikMerge /spare/repo/linux-2.6/
2005-06-26  Anton AltaparmakovAutomatic merge with /usr/src/ntfs-2.6.git.
2005-06-26  Jeff GarzikMerge upstream (approx. 2.6.12-git8) into 'janitor...
2005-06-26  Linus TorvaldsMerge 'drm-3264' branch of /linux/kernel/git/airlied...
2005-06-26  Linus TorvaldsMerge 'drm-fixes' branch of /linux/kernel/git/airlied...
2005-06-23  Dave AirlieCurrently DRM depends on PCI this will need to change...
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2