Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Jul 2008 04:19:17 +0000 (21:19 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Jul 2008 04:19:17 +0000 (21:19 -0700)
commit734b397cd14f3340394a8dd3266bec97d01f034b
tree0ac0ff92b1e8420992ab01af7fdf4459f59c9551
parent702beb87d6b4e08cca394b210679e5d7c2ac9383
parente6b51632b3579d96ce5aa1b3efdeceedd2921a2c
Merge branch 'drm-fixes' of git://git./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.