From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 8 Sep 2005 00:29:07 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
X-Git-Tag: v2.6.14-rc1~523
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=db400b3c4ee89d384d9163836a55577abdae772d;p=linux-2.6-omap-h63xx.git

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

db400b3c4ee89d384d9163836a55577abdae772d