From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Sat, 9 Jul 2005 16:59:23 +0000 (-0700)
Subject: Merge head 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
X-Git-Tag: v2.6.13-rc3~99
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=0109fd37046de64e8459f8c4f4706df9ac7cc82c;p=safe%2Fjmp%2Flinux-2.6

Merge head 'drm-fixes' of /linux/kernel/git/airlied/drm-2.6
---

0109fd37046de64e8459f8c4f4706df9ac7cc82c