From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 9 Jul 2005 16:58:47 +0000 (-0700)
Subject: Merge head 'drm-3264' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
X-Git-Tag: v2.6.13-rc3~100
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc14cf46da215a9df1c0a4388763a68769ef9e53;p=linux-2.6

Merge head 'drm-3264' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
---

cc14cf46da215a9df1c0a4388763a68769ef9e53