tree 0ac0ff92b1e8420992ab01af7fdf4459f59c9551
parent 702beb87d6b4e08cca394b210679e5d7c2ac9383
parent e6b51632b3579d96ce5aa1b3efdeceedd2921a2c
author Linus Torvalds <torvalds@linux-foundation.org> 1216613957 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1216613957 -0700

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.