Merge branch 'nouveau-1'

diff --cc linux-core/Makefile
index 06a15ff,92ddfd3..590633b
--- 1/linux-core/Makefile
--- 2/linux-core/Makefile
+++ b/linux-core/Makefile
@@@ -85,16 -90,31 +85,17 @@@ MGAHEADERS =    mga_drv.h mga_drm.h mga
  I810HEADERS =   i810_drv.h i810_drm.h $(DRMHEADERS)
  I830HEADERS =   i830_drv.h i830_drm.h $(DRMHEADERS)
  I915HEADERS =   i915_drv.h i915_drm.h $(DRMHEADERS)
 -I915SHARED  =   i915_drv.h i915_drm.h i915_irq.c i915_mem.c i915_dma.c
  SISHEADERS=     sis_drv.h sis_drm.h drm_hashtab.h drm_sman.h $(DRMHEADERS)
 -SISSHARED=      sis_drv.h sis_drm.h
  SAVAGEHEADERS=  savage_drv.h savage_drm.h $(DRMHEADERS)
 -SAVAGESHARED= savage_drv.h savage_drm.h savage_bci.c savage_state.c
  VIAHEADERS =  via_drm.h via_drv.h via_3d_reg.h via_verifier.h $(DRMHEADERS)
 -VIASHARED     = via_drm.h via_drv.h via_3d_reg.h via_drv.c via_irq.c via_map.c \
 -              via_dma.c via_verifier.c via_verifier.h via_video.c
  MACH64HEADERS = mach64_drv.h mach64_drm.h $(DRMHEADERS)
 -MACH64SHARED =        mach64_drv.h mach64_drm.h mach64_dma.c \
 -              mach64_irq.c mach64_state.c
  NVHEADERS =     nv_drv.h $(DRMHEADERS)
 -NVSHARED  =     nv_drv.h
  FFBHEADERS =  ffb_drv.h $(DRMHEADERS)
+ NOUVEAUHEADERS = nouveau_drv.h nouveau_drm.h nouveau_reg.h $(DRMHEADERS)
  
 -SHAREDSRC = $(DRMSHARED) $(MGASHARED) $(R128SHARED) $(RADEONSHARED) \
 -      $(SISSHARED) $(TDFXSHARED) $(VIASHARED) $(MACH64SHARED) \
 -      $(I915SHARED) $(SAVAGESHARED) $(NVSHARED)
 -
  PROGS = dristat drmstat
  
 -CLEANFILES = *.o *.ko $(PROGS) .depend .*.flags .*.d .*.cmd *.mod.c linux drm_pciids.h .tmp_versions
 +CLEANFILES = *.o *.ko $(PROGS) .depend .*.flags .*.d .*.cmd *.mod.c drm_pciids.h .tmp_versions
  
  # VERSION is not defined from the initial invocation.  It is defined when
  # this Makefile is invoked from the kernel's root Makefile.

diff --cc linux-core/drm_fops.c
Simple merge