From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Wed, 2 Nov 2005 05:49:07 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
X-Git-Tag: v2.6.15-rc1~18^2~14
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8762748cae4f85b3201c0304969d993b42d5258;p=pandora-kernel.git

Merge /pub/scm/linux/kernel/git/airlied/drm-2.6

Manual fixups for some clashes due to re-indenting.
---

d8762748cae4f85b3201c0304969d993b42d5258
Reading git-diff-tree failed