From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Jul 2008 04:19:17 +0000 (-0700)
Subject: Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied... 
X-Git-Tag: v2.6.27-rc1~962
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=734b397cd14f3340394a8dd3266bec97d01f034b;p=linux-2.6-omap-h63xx.git

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

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  gpu: re-order GPU subdirectory vs char for AGP vs DRM startup.
---

734b397cd14f3340394a8dd3266bec97d01f034b