Merge branch 'drm-nouveau-pony' of git://git.kernel.org/pub/scm/linux/kernel/git...

* '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

diff --combined drivers/staging/Kconfig
index dfcd75cf4907f5c992bc853f59850611848c128a,da74e216b71d89ec5e930ccee4a68050f5ae91c4..80e71fce1850e6f23bb644ea7565b72c64a3c76d
--- 1/drivers/staging/Kconfig
--- 2/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -103,6 -103,8 +103,8 @@@ source "drivers/staging/line6/Kconfig
  
  source "drivers/gpu/drm/radeon/Kconfig"
  
+ source "drivers/gpu/drm/nouveau/Kconfig"
+ 
  source "drivers/staging/octeon/Kconfig"
  
  source "drivers/staging/serqt_usb2/Kconfig"
@@@ -125,13 -127,5 +127,13 @@@ source "drivers/staging/sep/Kconfig
  
  source "drivers/staging/iio/Kconfig"
  
 +source "drivers/staging/strip/Kconfig"
 +
 +source "drivers/staging/arlan/Kconfig"
 +
 +source "drivers/staging/wavelan/Kconfig"
 +
 +source "drivers/staging/netwave/Kconfig"
 +
  endif # !STAGING_EXCLUDE_BUILD
  endif # STAGING