From: Dave Airlie <airlied@redhat.com>
Date: Fri, 6 Nov 2009 04:33:40 +0000 (+1000)
Subject: Merge branch 'drm-next' of ../drm-2.6 into drm-next
X-Git-Tag: v2.6.33-rc1~323^2~5^2~19^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe625f137d28d1ebe22a71ee064ffab2841055a5;p=pandora-kernel.git

Merge branch 'drm-next' of ../drm-2.6 into drm-next
---

fe625f137d28d1ebe22a71ee064ffab2841055a5
Reading git-diff-tree failed