Merge branch 'drm-nouveau-pony' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Dec 2009 22:32:49 +0000 (14:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Dec 2009 22:32:49 +0000 (14:32 -0800)
commit9764757932ce26f139332f89d1d3b815e4cc56ab
treecda405e75ecd7e478cbee85cfe1c5ebd1ecabcc6
parent9148bce4a7d7b532e49a3bc546f1703a58dfad45
parent6ee738610f41b59733f63718f0bdbcba7d3a3f12
Merge branch 'drm-nouveau-pony' of git://git./linux/kernel/git/airlied/drm-2.6

* 'drm-nouveau-pony' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/nouveau: Add DRM driver for NVIDIA GPUs
drivers/staging/Kconfig