diff --git a/packages/linux/patches/110-linux-2.6.36-drm_nouveau_upstream-20101022.diff b/packages/linux/patches/110-linux-2.6.36-drm_nouveau_upstream-20101023.diff
similarity index 99%
rename from packages/linux/patches/110-linux-2.6.36-drm_nouveau_upstream-20101022.diff
rename to packages/linux/patches/110-linux-2.6.36-drm_nouveau_upstream-20101023.diff
index 31f946ebaf..3c783b7b4f 100644
--- a/packages/linux/patches/110-linux-2.6.36-drm_nouveau_upstream-20101022.diff
+++ b/packages/linux/patches/110-linux-2.6.36-drm_nouveau_upstream-20101023.diff
@@ -1,6 +1,6 @@
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/Kconfig linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/Kconfig
 --- linux-2.6.36/drivers/gpu/drm/nouveau/Kconfig	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/Kconfig	2010-10-22 23:59:52.455453201 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/Kconfig	2010-10-24 22:05:10.712404390 +0200
 @@ -10,6 +10,7 @@
  	select FB
  	select FRAMEBUFFER_CONSOLE if !EMBEDDED
@@ -11,7 +11,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/Kconfig linux-2.6.36.nouveau/dri
  
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/Makefile linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/Makefile
 --- linux-2.6.36/drivers/gpu/drm/nouveau/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/Makefile	2010-10-22 23:59:52.455453201 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/Makefile	2010-10-24 22:05:10.712404390 +0200
 @@ -9,7 +9,8 @@
               nouveau_bo.o nouveau_fence.o nouveau_gem.o nouveau_ttm.o \
               nouveau_hw.o nouveau_calc.o nouveau_bios.o nouveau_i2c.o \
@@ -42,7 +42,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/Makefile linux-2.6.36.nouveau/dr
  nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_acpi.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_acpi.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_acpi.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_acpi.c	2010-10-22 23:59:52.463453300 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_acpi.c	2010-10-24 22:05:10.719404464 +0200
 @@ -292,6 +292,6 @@
  	if (ret < 0)
  		return ret;
@@ -53,7 +53,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_acpi.c linux-2.6.36.nouv
  }
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_bios.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_bios.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_bios.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_bios.c	2010-10-22 23:59:52.469453373 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_bios.c	2010-10-24 22:05:10.723404508 +0200
 @@ -43,9 +43,6 @@
  #define BIOSLOG(sip, fmt, arg...) NV_DEBUG(sip->dev, fmt, ##arg)
  #define LOG_OLD_VALUE(x)
@@ -603,7 +603,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_bios.c linux-2.6.36.nouv
  	if (ret)
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_bios.h linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_bios.h
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_bios.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_bios.h	2010-10-22 23:59:52.472453412 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_bios.h	2010-10-24 22:05:10.726404540 +0200
 @@ -34,6 +34,20 @@
  
  #define DCB_LOC_ON_CHIP 0
@@ -674,7 +674,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_bios.h linux-2.6.36.nouv
  
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_bo.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_bo.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_bo.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_bo.c	2010-10-22 23:59:52.473453424 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_bo.c	2010-10-24 22:05:10.727404551 +0200
 @@ -36,21 +36,6 @@
  #include <linux/log2.h>
  #include <linux/slab.h>
@@ -1208,7 +1208,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_bo.c linux-2.6.36.nouvea
  	.io_mem_free = &nouveau_ttm_io_mem_free,
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_calc.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_calc.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_calc.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_calc.c	2010-10-22 23:59:52.474453436 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_calc.c	2010-10-24 22:05:10.729404571 +0200
 @@ -198,8 +198,8 @@
  	struct drm_nouveau_private *dev_priv = dev->dev_private;
  	struct nv_fifo_info fifo_data;
@@ -1248,7 +1248,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_calc.c linux-2.6.36.nouv
  static int
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_channel.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_channel.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_channel.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_channel.c	2010-10-22 23:59:52.475453448 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_channel.c	2010-10-24 22:05:10.729404572 +0200
 @@ -48,14 +48,14 @@
  						  dev_priv->gart_info.aper_size,
  						  NV_DMA_ACCESS_RO, &pushbuf,
@@ -1754,7 +1754,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_channel.c linux-2.6.36.n
  int nouveau_max_ioctl = DRM_ARRAY_SIZE(nouveau_ioctls);
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_connector.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_connector.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_connector.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_connector.c	2010-10-22 23:59:52.476453460 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_connector.c	2010-10-24 22:05:19.498498260 +0200
 @@ -76,6 +76,22 @@
  	return NULL;
  }
@@ -1969,15 +1969,17 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_connector.c linux-2.6.36
  		break;
  	default:
  		nv_connector->scaling_mode = DRM_MODE_SCALE_FULLSCREEN;
-@@ -836,11 +887,14 @@
+@@ -836,11 +887,16 @@
  				dev->mode_config.dithering_mode_property,
  				nv_connector->use_dithering ?
  				DRM_MODE_DITHERING_ON : DRM_MODE_DITHERING_OFF);
 +
-+		if (dev_priv->card_type >= NV_50)
-+			connector->polled = DRM_CONNECTOR_POLL_HPD;
-+		else
-+			connector->polled = DRM_CONNECTOR_POLL_CONNECT;
++		if (dcb->type != DCB_CONNECTOR_LVDS) {
++			if (dev_priv->card_type >= NV_50)
++				connector->polled = DRM_CONNECTOR_POLL_HPD;
++			else
++				connector->polled = DRM_CONNECTOR_POLL_CONNECT;
++		}
  		break;
  	}
  
@@ -1988,7 +1990,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_connector.c linux-2.6.36
  	return dcb->drm;
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_connector.h linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_connector.h
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_connector.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_connector.h	2010-10-22 23:59:52.477453472 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_connector.h	2010-10-24 22:05:10.732404603 +0200
 @@ -52,7 +52,7 @@
  struct drm_connector *
  nouveau_connector_create(struct drm_device *, int index);
@@ -2001,7 +2003,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_connector.h linux-2.6.36
  #endif /* __NOUVEAU_CONNECTOR_H__ */
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_debugfs.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_debugfs.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_debugfs.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_debugfs.c	2010-10-22 23:59:52.478453484 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_debugfs.c	2010-10-24 22:05:10.732404603 +0200
 @@ -157,7 +157,23 @@
  	return 0;
  }
@@ -2028,7 +2030,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_debugfs.c linux-2.6.36.n
  	{ "vbios.rom", nouveau_debugfs_vbios_image, 0, NULL },
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_display.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_display.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_display.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_display.c	2010-10-22 23:59:52.479453496 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_display.c	2010-10-24 22:05:10.733404613 +0200
 @@ -29,6 +29,9 @@
  #include "nouveau_drv.h"
  #include "nouveau_fb.h"
@@ -2249,7 +2251,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_display.c linux-2.6.36.n
 +}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_dma.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_dma.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_dma.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_dma.c	2010-10-22 23:59:52.480453509 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_dma.c	2010-10-24 22:05:10.734404624 +0200
 @@ -28,6 +28,7 @@
  #include "drm.h"
  #include "nouveau_drv.h"
@@ -2326,7 +2328,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_dma.c linux-2.6.36.nouve
  	return 0;
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_dma.h linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_dma.h
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_dma.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_dma.h	2010-10-22 23:59:52.495453696 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_dma.h	2010-10-24 22:05:10.734404624 +0200
 @@ -72,6 +72,7 @@
  	NvGdiRect	= 0x8000000c,
  	NvImageBlit	= 0x8000000d,
@@ -2337,7 +2339,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_dma.h linux-2.6.36.nouve
  	NvEvoVRAM	= 0x01000000,
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_dp.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_dp.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_dp.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_dp.c	2010-10-22 23:59:52.495453696 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_dp.c	2010-10-24 22:05:10.735404635 +0200
 @@ -317,7 +317,8 @@
  		return false;
  
@@ -2374,7 +2376,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_dp.c linux-2.6.36.nouvea
  			ret = -EBUSY;
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_drv.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_drv.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_drv.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_drv.c	2010-10-22 23:59:52.496453708 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_drv.c	2010-10-24 22:05:10.736404646 +0200
 @@ -31,13 +31,14 @@
  #include "nouveau_hw.h"
  #include "nouveau_fb.h"
@@ -2502,7 +2504,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_drv.c linux-2.6.36.nouve
  }
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_drv.h linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_drv.h
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_drv.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_drv.h	2010-10-22 23:59:52.499453744 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_drv.h	2010-10-24 22:05:10.738404668 +0200
 @@ -96,10 +96,12 @@
  	struct nouveau_tile_reg *tile;
  
@@ -3387,7 +3389,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_drv.h linux-2.6.36.nouve
  #endif /* __NOUVEAU_DRV_H__ */
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_encoder.h linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_encoder.h
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_encoder.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_encoder.h	2010-10-22 23:59:52.501453768 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_encoder.h	2010-10-24 22:05:10.739404678 +0200
 @@ -55,6 +55,7 @@
  			int dpcd_version;
  			int link_nr;
@@ -3398,7 +3400,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_encoder.h linux-2.6.36.n
  };
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_fbcon.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_fbcon.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_fbcon.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_fbcon.c	2010-10-22 23:59:52.502453781 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_fbcon.c	2010-10-24 22:05:10.741404698 +0200
 @@ -49,6 +49,96 @@
  #include "nouveau_fbcon.h"
  #include "nouveau_dma.h"
@@ -3618,7 +3620,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_fbcon.c linux-2.6.36.nou
  
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_fbcon.h linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_fbcon.h
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_fbcon.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_fbcon.h	2010-10-22 23:59:52.503453794 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_fbcon.h	2010-10-24 22:05:10.741404698 +0200
 @@ -40,13 +40,13 @@
  
  void nouveau_fbcon_restore(void);
@@ -3641,7 +3643,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_fbcon.h linux-2.6.36.nou
  void nouveau_fbcon_gpu_lockup(struct fb_info *info);
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_fence.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_fence.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_fence.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_fence.c	2010-10-22 23:59:52.504453807 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_fence.c	2010-10-24 22:05:10.743404720 +0200
 @@ -28,9 +28,11 @@
  #include "drm.h"
  
@@ -4139,7 +4141,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_fence.c linux-2.6.36.nou
 +}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_gem.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_gem.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_gem.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_gem.c	2010-10-22 23:59:52.506453832 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_gem.c	2010-10-24 22:05:10.744404731 +0200
 @@ -48,9 +48,6 @@
  		return;
  	nvbo->gem = NULL;
@@ -4490,7 +4492,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_gem.c linux-2.6.36.nouve
  int
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_grctx.h linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_grctx.h
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_grctx.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_grctx.h	2010-10-22 23:59:52.510453880 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_grctx.h	2010-10-24 22:05:10.745404742 +0200
 @@ -126,7 +126,7 @@
  	reg = (reg - 0x00400000) / 4;
  	reg = (reg - ctx->ctxprog_reg) + ctx->ctxvals_base;
@@ -4502,7 +4504,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_grctx.h linux-2.6.36.nou
  
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_hw.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_hw.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_hw.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_hw.c	2010-10-22 23:59:52.511453892 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_hw.c	2010-10-24 22:05:10.748404775 +0200
 @@ -305,7 +305,7 @@
  	bool mpll = Preg == 0x4020;
  	uint32_t oldPval = nvReadMC(dev, Preg);
@@ -4654,7 +4656,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_hw.c linux-2.6.36.nouvea
  
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_hw.h linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_hw.h
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_hw.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_hw.h	2010-10-22 23:59:52.512453904 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_hw.h	2010-10-24 22:05:10.749404785 +0200
 @@ -416,6 +416,25 @@
  }
  
@@ -4683,7 +4685,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_hw.h linux-2.6.36.nouvea
  	struct drm_nouveau_private *dev_priv = dev->dev_private;
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_i2c.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_i2c.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_i2c.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_i2c.c	2010-10-22 23:59:52.513453917 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_i2c.c	2010-10-24 22:05:10.750404795 +0200
 @@ -299,7 +299,10 @@
  
  int
@@ -4708,7 +4710,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_i2c.c linux-2.6.36.nouve
  		}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_i2c.h linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_i2c.h
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_i2c.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_i2c.h	2010-10-22 23:59:52.513453917 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_i2c.h	2010-10-24 22:05:10.751404805 +0200
 @@ -44,7 +44,10 @@
  struct nouveau_i2c_chan *nouveau_i2c_find(struct drm_device *, int index);
  bool nouveau_probe_i2c_addr(struct nouveau_i2c_chan *i2c, int addr);
@@ -4723,7 +4725,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_i2c.h linux-2.6.36.nouve
  
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_irq.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_irq.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_irq.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_irq.c	2010-10-22 23:59:52.516453956 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_irq.c	2010-10-24 22:05:10.753404826 +0200
 @@ -35,12 +35,20 @@
  #include "nouveau_drm.h"
  #include "nouveau_drv.h"
@@ -5265,7 +5267,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_irq.c linux-2.6.36.nouve
 +}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_mem.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_mem.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_mem.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_mem.c	2010-10-22 23:59:52.517453968 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_mem.c	2010-10-24 22:05:10.755404848 +0200
 @@ -33,7 +33,9 @@
  #include "drmP.h"
  #include "drm.h"
@@ -5805,7 +5807,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_mem.c linux-2.6.36.nouve
 +}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_notifier.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_notifier.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_notifier.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_notifier.c	2010-10-22 23:59:52.528454104 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_notifier.c	2010-10-24 22:05:10.756404859 +0200
 @@ -28,6 +28,7 @@
  #include "drmP.h"
  #include "drm.h"
@@ -5857,7 +5859,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_notifier.c linux-2.6.36.
  }
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_object.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_object.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_object.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_object.c	2010-10-22 23:59:52.531454140 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_object.c	2010-10-24 22:05:10.759404891 +0200
 @@ -34,6 +34,84 @@
  #include "drm.h"
  #include "nouveau_drv.h"
@@ -7201,7 +7203,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_object.c linux-2.6.36.no
  }
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_perf.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_perf.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_perf.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_perf.c	2010-10-22 23:59:52.532454152 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_perf.c	2010-10-24 22:05:10.760404901 +0200
 @@ -0,0 +1,205 @@
 +/*
 + * Copyright 2010 Red Hat Inc.
@@ -7410,7 +7412,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_perf.c linux-2.6.36.nouv
 +}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_pm.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_pm.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_pm.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_pm.c	2010-10-22 23:59:52.533454164 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_pm.c	2010-10-24 22:05:10.761404911 +0200
 @@ -0,0 +1,548 @@
 +/*
 + * Copyright 2010 Red Hat Inc.
@@ -7962,7 +7964,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_pm.c linux-2.6.36.nouvea
 +}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_pm.h linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_pm.h
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_pm.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_pm.h	2010-10-22 23:59:52.534454177 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_pm.h	2010-10-24 22:05:10.761404911 +0200
 @@ -0,0 +1,74 @@
 +/*
 + * Copyright 2010 Red Hat Inc.
@@ -8040,7 +8042,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_pm.h linux-2.6.36.nouvea
 +#endif
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_ramht.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_ramht.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_ramht.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_ramht.c	2010-10-22 23:59:52.534454177 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_ramht.c	2010-10-24 22:05:10.762404922 +0200
 @@ -0,0 +1,307 @@
 +/*
 + * Copyright 2010 Red Hat Inc.
@@ -8351,7 +8353,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_ramht.c linux-2.6.36.nou
 +}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_ramht.h linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_ramht.h
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_ramht.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_ramht.h	2010-10-22 23:59:52.535454190 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_ramht.h	2010-10-24 22:05:10.763404933 +0200
 @@ -0,0 +1,55 @@
 +/*
 + * Copyright 2010 Red Hat Inc.
@@ -8410,7 +8412,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_ramht.h linux-2.6.36.nou
 +#endif
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_reg.h linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_reg.h
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_reg.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_reg.h	2010-10-22 23:59:52.536454203 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_reg.h	2010-10-24 22:05:10.764404944 +0200
 @@ -332,6 +332,7 @@
  #define NV04_PGRAPH_BSWIZZLE5                              0x004006A0
  #define NV03_PGRAPH_STATUS                                 0x004006B0
@@ -8523,7 +8525,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_reg.h linux-2.6.36.nouve
  #define NV50_PDISPLAY_CRTC_CLK_CTRL1(i)                 ((i) * 0x800 + 0x614100)
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_sgdma.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_sgdma.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_sgdma.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_sgdma.c	2010-10-22 23:59:52.538454228 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_sgdma.c	2010-10-24 22:05:10.766404966 +0200
 @@ -95,9 +95,9 @@
  	struct nouveau_gpuobj *gpuobj = dev_priv->gart_info.sg_ctxdma;
  	unsigned i, j, pte;
@@ -8677,7 +8679,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_sgdma.c linux-2.6.36.nou
  
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_state.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_state.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_state.c	2010-10-22 23:59:52.540454252 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_state.c	2010-10-24 22:05:10.767404977 +0200
 @@ -35,6 +35,8 @@
  #include "nouveau_drv.h"
  #include "nouveau_drm.h"
@@ -9218,7 +9220,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_state.c linux-2.6.36.nou
  		return false;
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_temp.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_temp.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_temp.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_temp.c	2010-10-22 23:59:52.546454326 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_temp.c	2010-10-24 22:05:10.769404997 +0200
 @@ -0,0 +1,309 @@
 +/*
 + * Copyright 2010 PathScale inc.
@@ -9531,7 +9533,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_temp.c linux-2.6.36.nouv
 +}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_volt.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_volt.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_volt.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_volt.c	2010-10-22 23:59:52.547454339 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nouveau_volt.c	2010-10-24 22:05:10.769404998 +0200
 @@ -0,0 +1,212 @@
 +/*
 + * Copyright 2010 Red Hat Inc.
@@ -9747,7 +9749,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nouveau_volt.c linux-2.6.36.nouv
 +}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_crtc.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_crtc.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv04_crtc.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_crtc.c	2010-10-22 23:59:52.550454376 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_crtc.c	2010-10-24 22:05:10.770405008 +0200
 @@ -109,7 +109,7 @@
  	struct nouveau_pll_vals *pv = &regp->pllvals;
  	struct pll_lims pll_lim;
@@ -9824,7 +9826,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_crtc.c linux-2.6.36.nouveau
  
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_dac.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_dac.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv04_dac.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_dac.c	2010-10-22 23:59:52.552454400 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_dac.c	2010-10-24 22:05:10.772405028 +0200
 @@ -291,6 +291,8 @@
  	msleep(5);
  
@@ -9859,7 +9861,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_dac.c linux-2.6.36.nouveau/
  			      struct drm_display_mode *adjusted_mode)
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_dfp.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_dfp.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv04_dfp.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_dfp.c	2010-10-22 23:59:52.553454412 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_dfp.c	2010-10-24 22:05:10.773405039 +0200
 @@ -104,6 +104,8 @@
  	}
  	/* don't inadvertently turn it on when state written later */
@@ -9943,7 +9945,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_dfp.c linux-2.6.36.nouveau/
  
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_fbcon.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_fbcon.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv04_fbcon.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_fbcon.c	2010-10-22 23:59:52.554454424 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_fbcon.c	2010-10-24 22:05:10.773405039 +0200
 @@ -25,54 +25,42 @@
  #include "drmP.h"
  #include "nouveau_drv.h"
@@ -10093,7 +10095,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_fbcon.c linux-2.6.36.nouvea
  int
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_fifo.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_fifo.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv04_fifo.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_fifo.c	2010-10-22 23:59:52.555454436 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_fifo.c	2010-10-24 22:05:10.774405050 +0200
 @@ -27,8 +27,9 @@
  #include "drmP.h"
  #include "drm.h"
@@ -10261,7 +10263,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_fifo.c linux-2.6.36.nouveau
  		}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_graph.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_graph.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv04_graph.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_graph.c	2010-10-22 23:59:52.557454462 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_graph.c	2010-10-24 22:05:10.776405072 +0200
 @@ -26,6 +26,9 @@
  #include "drm.h"
  #include "nouveau_drm.h"
@@ -11025,7 +11027,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_graph.c linux-2.6.36.nouvea
 -
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_instmem.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_instmem.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv04_instmem.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_instmem.c	2010-10-22 23:59:52.558454475 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_instmem.c	2010-10-24 22:05:10.777405083 +0200
 @@ -1,6 +1,7 @@
  #include "drmP.h"
  #include "drm.h"
@@ -11224,7 +11226,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_instmem.c linux-2.6.36.nouv
  
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_pm.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_pm.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv04_pm.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_pm.c	2010-10-22 23:59:52.558454475 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_pm.c	2010-10-24 22:05:10.778405094 +0200
 @@ -0,0 +1,81 @@
 +/*
 + * Copyright 2010 Red Hat Inc.
@@ -11309,7 +11311,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_pm.c linux-2.6.36.nouveau/d
 +
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_tv.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_tv.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv04_tv.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_tv.c	2010-10-22 23:59:52.559454487 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv04_tv.c	2010-10-24 22:05:10.778405094 +0200
 @@ -49,8 +49,8 @@
  
  int nv04_tv_identify(struct drm_device *dev, int i2c_index)
@@ -11338,7 +11340,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv04_tv.c linux-2.6.36.nouveau/d
  		       state->CRTC[NV_CIO_CRE_LCD__INDEX]);
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv10_fifo.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv10_fifo.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv10_fifo.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv10_fifo.c	2010-10-22 23:59:52.560454499 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv10_fifo.c	2010-10-24 22:05:10.779405104 +0200
 @@ -27,8 +27,9 @@
  #include "drmP.h"
  #include "drm.h"
@@ -11417,7 +11419,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv10_fifo.c linux-2.6.36.nouveau
  		}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv10_graph.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv10_graph.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv10_graph.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv10_graph.c	2010-10-22 23:59:52.561454511 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv10_graph.c	2010-10-24 22:05:10.781405124 +0200
 @@ -27,6 +27,8 @@
  #include "nouveau_drm.h"
  #include "nouveau_drv.h"
@@ -11600,7 +11602,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv10_graph.c linux-2.6.36.nouvea
 +}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv17_tv.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv17_tv.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv17_tv.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv17_tv.c	2010-10-22 23:59:52.562454523 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv17_tv.c	2010-10-24 22:05:10.782405135 +0200
 @@ -193,55 +193,56 @@
  	}
  }
@@ -11763,7 +11765,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv17_tv.c linux-2.6.36.nouveau/d
  	dacclk = (NVReadRAMDAC(dev, 0, dacclk_off) & ~0x30) | 0x1;
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv17_tv.h linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv17_tv.h
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv17_tv.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv17_tv.h	2010-10-22 23:59:52.563454535 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv17_tv.h	2010-10-24 22:05:10.783405146 +0200
 @@ -127,7 +127,8 @@
  
  /* TV hardware access functions */
@@ -11801,7 +11803,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv17_tv.h linux-2.6.36.nouveau/d
  #endif
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv17_tv_modes.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv17_tv_modes.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv17_tv_modes.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv17_tv_modes.c	2010-10-22 23:59:52.564454547 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv17_tv_modes.c	2010-10-24 22:05:10.784405157 +0200
 @@ -336,12 +336,17 @@
  			struct filter_params *p = &fparams[k][j];
  
@@ -11895,7 +11897,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv17_tv_modes.c linux-2.6.36.nou
  	regs->fp_horiz_regs[FP_VALID_END] = output_mode->hdisplay - hmargin - 1;
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv20_graph.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv20_graph.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv20_graph.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv20_graph.c	2010-10-22 23:59:52.568454598 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv20_graph.c	2010-10-24 22:05:10.787405190 +0200
 @@ -32,54 +32,57 @@
  #define NV34_GRCTX_SIZE    (18140)
  #define NV35_36_GRCTX_SIZE (22396)
@@ -12744,7 +12746,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv20_graph.c linux-2.6.36.nouvea
 +}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv40_fifo.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv40_fifo.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv40_fifo.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv40_fifo.c	2010-10-22 23:59:52.569454611 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv40_fifo.c	2010-10-24 22:05:10.790405221 +0200
 @@ -27,8 +27,9 @@
  #include "drmP.h"
  #include "nouveau_drv.h"
@@ -12835,7 +12837,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv40_fifo.c linux-2.6.36.nouveau
  		}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv40_graph.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv40_graph.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv40_graph.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv40_graph.c	2010-10-22 23:59:52.570454623 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv40_graph.c	2010-10-24 22:05:10.791405231 +0200
 @@ -29,6 +29,8 @@
  #include "nouveau_drv.h"
  #include "nouveau_grctx.h"
@@ -13001,7 +13003,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv40_graph.c linux-2.6.36.nouvea
 +}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv40_grctx.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv40_grctx.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv40_grctx.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv40_grctx.c	2010-10-22 23:59:52.571454635 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv40_grctx.c	2010-10-24 22:05:10.793405252 +0200
 @@ -596,13 +596,13 @@
  
  	offset += 0x0280/4;
@@ -13021,7 +13023,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv40_grctx.c linux-2.6.36.nouvea
  
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_calc.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_calc.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv50_calc.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_calc.c	2010-10-22 23:59:52.572454647 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_calc.c	2010-10-24 22:05:10.794405263 +0200
 @@ -51,24 +51,28 @@
  	       int *N, int *fN, int *M, int *P)
  {
@@ -13059,7 +13061,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_calc.c linux-2.6.36.nouveau
  	/* *N = floor(fb_div); */
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_crtc.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_crtc.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv50_crtc.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_crtc.c	2010-10-22 23:59:52.573454659 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_crtc.c	2010-10-24 22:05:10.797405296 +0200
 @@ -104,8 +104,7 @@
  		OUT_RING(evo, nv_crtc->lut.depth == 8 ?
  				NV50_EVO_CRTC_CLUT_MODE_OFF :
@@ -13171,7 +13173,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_crtc.c linux-2.6.36.nouveau
  
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_cursor.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_cursor.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv50_cursor.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_cursor.c	2010-10-22 23:59:52.574454671 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_cursor.c	2010-10-24 22:05:10.797405296 +0200
 @@ -147,7 +147,7 @@
  	NV_DEBUG_KMS(dev, "\n");
  
@@ -13183,7 +13185,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_cursor.c linux-2.6.36.nouve
  		NV_ERROR(dev, "CURSOR_CTRL2 = 0x%08x\n",
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_dac.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_dac.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv50_dac.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_dac.c	2010-10-22 23:59:52.574454671 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_dac.c	2010-10-24 22:05:10.798405307 +0200
 @@ -79,7 +79,7 @@
  
  	nv_wr32(dev, NV50_PDISPLAY_DAC_DPMS_CTRL(or),
@@ -13204,7 +13206,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_dac.c linux-2.6.36.nouveau/
  		NV_ERROR(dev, "DAC_DPMS_CTRL(%d) = 0x%08x\n", or,
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_display.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_display.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv50_display.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_display.c	2010-10-22 23:59:52.576454695 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_display.c	2010-10-24 22:05:10.799405317 +0200
 @@ -30,154 +30,20 @@
  #include "nouveau_connector.h"
  #include "nouveau_fb.h"
@@ -13745,7 +13747,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_display.c linux-2.6.36.nouv
  		if (intr1 & NV50_PDISPLAY_INTR_1_VBLANK_CRTC) {
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_evo.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_evo.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv50_evo.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_evo.c	2010-10-22 23:59:52.577454708 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_evo.c	2010-10-24 22:05:10.801405337 +0200
 @@ -0,0 +1,318 @@
 +/*
 + * Copyright 2010 Red Hat Inc.
@@ -14067,7 +14069,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_evo.c linux-2.6.36.nouveau/
 +}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_evo.h linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_evo.h
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv50_evo.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_evo.h	2010-10-22 23:59:52.577454708 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_evo.h	2010-10-24 22:05:10.801405337 +0200
 @@ -24,6 +24,15 @@
   *
   */
@@ -14091,7 +14093,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_evo.h linux-2.6.36.nouveau/
 +#endif
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_fb.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_fb.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv50_fb.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_fb.c	2010-10-22 23:59:52.588454844 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_fb.c	2010-10-24 22:05:10.802405348 +0200
 @@ -20,6 +20,7 @@
  	case 0x50:
  		nv_wr32(dev, 0x100c90, 0x0707ff);
@@ -14149,7 +14151,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_fb.c linux-2.6.36.nouveau/d
 +}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_fbcon.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_fbcon.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv50_fbcon.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_fbcon.c	2010-10-22 23:59:52.589454857 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_fbcon.c	2010-10-24 22:05:10.803405359 +0200
 @@ -1,28 +1,21 @@
  #include "drmP.h"
  #include "nouveau_drv.h"
@@ -14296,7 +14298,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_fbcon.c linux-2.6.36.nouvea
  
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_fifo.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_fifo.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv50_fifo.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_fifo.c	2010-10-22 23:59:52.590454870 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_fifo.c	2010-10-24 22:05:10.804405370 +0200
 @@ -27,13 +27,14 @@
  #include "drmP.h"
  #include "drm.h"
@@ -14756,7 +14758,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_fifo.c linux-2.6.36.nouveau
  	dev_priv->engine.instmem.flush(dev);
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_graph.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_graph.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv50_graph.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_graph.c	2010-10-22 23:59:52.591454883 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_graph.c	2010-10-24 22:05:10.805405381 +0200
 @@ -27,8 +27,12 @@
  #include "drmP.h"
  #include "drm.h"
@@ -15058,7 +15060,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_graph.c linux-2.6.36.nouvea
 +}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_grctx.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_grctx.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv50_grctx.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_grctx.c	2010-10-22 23:59:52.597454955 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_grctx.c	2010-10-24 22:05:10.817405509 +0200
 @@ -103,6 +103,9 @@
  #include "nouveau_drv.h"
  #include "nouveau_grctx.h"
@@ -18870,7 +18872,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_grctx.c linux-2.6.36.nouvea
  	}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_instmem.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_instmem.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv50_instmem.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_instmem.c	2010-10-22 23:59:52.601455006 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_instmem.c	2010-10-24 22:05:10.821405549 +0200
 @@ -32,39 +32,87 @@
  struct nv50_instmem_priv {
  	uint32_t save1700[5]; /* 0x1700->0x1710 */
@@ -19494,7 +19496,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_instmem.c linux-2.6.36.nouv
  
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_pm.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_pm.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv50_pm.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_pm.c	2010-10-22 23:59:52.602455019 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_pm.c	2010-10-24 22:05:10.822405560 +0200
 @@ -0,0 +1,131 @@
 +/*
 + * Copyright 2010 Red Hat Inc.
@@ -19629,7 +19631,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_pm.c linux-2.6.36.nouveau/d
 +
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_sor.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_sor.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv50_sor.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_sor.c	2010-10-22 23:59:52.603455031 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv50_sor.c	2010-10-24 22:05:10.823405571 +0200
 @@ -92,7 +92,7 @@
  	}
  
@@ -19650,7 +19652,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv50_sor.c linux-2.6.36.nouveau/
  		NV_ERROR(dev, "SOR_DPMS_STATE(%d) = 0x%08x\n", or,
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv84_crypt.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv84_crypt.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nv84_crypt.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv84_crypt.c	2010-10-22 23:59:52.604455043 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nv84_crypt.c	2010-10-24 22:05:10.825405593 +0200
 @@ -0,0 +1,104 @@
 +/*
 + * Copyright 2010 Red Hat Inc.
@@ -19758,7 +19760,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nv84_crypt.c linux-2.6.36.nouvea
 +}
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nva3_pm.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nva3_pm.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nva3_pm.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nva3_pm.c	2010-10-22 23:59:52.604455043 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nva3_pm.c	2010-10-24 22:05:10.826405604 +0200
 @@ -0,0 +1,95 @@
 +/*
 + * Copyright 2010 Red Hat Inc.
@@ -19857,7 +19859,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nva3_pm.c linux-2.6.36.nouveau/d
 +
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nvc0_fifo.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nvc0_fifo.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nvc0_fifo.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nvc0_fifo.c	2010-10-22 23:59:52.605455055 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nvc0_fifo.c	2010-10-24 22:05:10.826405604 +0200
 @@ -43,12 +43,6 @@
  }
  
@@ -19873,7 +19875,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nvc0_fifo.c linux-2.6.36.nouveau
  	return false;
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nvc0_instmem.c linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nvc0_instmem.c
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nvc0_instmem.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nvc0_instmem.c	2010-10-22 23:59:52.605455055 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nvc0_instmem.c	2010-10-24 22:05:10.827405615 +0200
 @@ -28,7 +28,7 @@
  
  int
@@ -19940,7 +19942,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nvc0_instmem.c linux-2.6.36.nouv
  
 diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nvreg.h linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nvreg.h
 --- linux-2.6.36/drivers/gpu/drm/nouveau/nvreg.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nvreg.h	2010-10-22 23:59:52.606455067 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/nouveau/nvreg.h	2010-10-24 22:05:10.828405626 +0200
 @@ -153,7 +153,8 @@
  #define NV_PCRTC_START					0x00600800
  #define NV_PCRTC_CONFIG					0x00600804
@@ -19961,7 +19963,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/nouveau/nvreg.h linux-2.6.36.nouveau/dri
  #	define NV_CIO_CRE_ILACE__INDEX		0x39	/* interlace */
 diff -Naur linux-2.6.36/drivers/gpu/drm/radeon/radeon_object.c linux-2.6.36.nouveau/drivers/gpu/drm/radeon/radeon_object.c
 --- linux-2.6.36/drivers/gpu/drm/radeon/radeon_object.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/radeon/radeon_object.c	2010-10-22 23:59:52.618455215 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/radeon/radeon_object.c	2010-10-24 22:05:10.829405637 +0200
 @@ -435,7 +435,7 @@
  
  out:
@@ -19991,7 +19993,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/radeon/radeon_object.c linux-2.6.36.nouv
  				return -EINVAL;
 diff -Naur linux-2.6.36/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.36.nouveau/drivers/gpu/drm/radeon/radeon_ttm.c
 --- linux-2.6.36/drivers/gpu/drm/radeon/radeon_ttm.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/radeon/radeon_ttm.c	2010-10-22 23:59:52.618455215 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/radeon/radeon_ttm.c	2010-10-24 22:05:10.830405648 +0200
 @@ -152,6 +152,7 @@
  		man->default_caching = TTM_PL_FLAG_CACHED;
  		break;
@@ -20091,7 +20093,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.36.nouveau
  	/* Add ttm page pool to debugfs */
 diff -Naur linux-2.6.36/drivers/gpu/drm/ttm/Makefile linux-2.6.36.nouveau/drivers/gpu/drm/ttm/Makefile
 --- linux-2.6.36/drivers/gpu/drm/ttm/Makefile	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/ttm/Makefile	2010-10-22 23:59:52.620455239 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/ttm/Makefile	2010-10-24 22:05:10.831405658 +0200
 @@ -4,6 +4,7 @@
  ccflags-y := -Iinclude/drm
  ttm-y := ttm_agp_backend.o ttm_memory.o ttm_tt.o ttm_bo.o \
@@ -20103,7 +20105,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/ttm/Makefile linux-2.6.36.nouveau/driver
  obj-$(CONFIG_DRM_TTM) += ttm.o
 diff -Naur linux-2.6.36/drivers/gpu/drm/ttm/ttm_agp_backend.c linux-2.6.36.nouveau/drivers/gpu/drm/ttm/ttm_agp_backend.c
 --- linux-2.6.36/drivers/gpu/drm/ttm/ttm_agp_backend.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/ttm/ttm_agp_backend.c	2010-10-22 23:59:52.621455252 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/ttm/ttm_agp_backend.c	2010-10-24 22:05:10.832405668 +0200
 @@ -74,6 +74,7 @@
  {
  	struct ttm_agp_backend *agp_be =
@@ -20123,7 +20125,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/ttm/ttm_agp_backend.c linux-2.6.36.nouve
  
 diff -Naur linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.36.nouveau/drivers/gpu/drm/ttm/ttm_bo.c
 --- linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/ttm/ttm_bo.c	2010-10-23 00:04:39.844020281 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/ttm/ttm_bo.c	2010-10-24 22:05:10.833405678 +0200
 @@ -84,11 +84,8 @@
  		man->available_caching);
  	printk(KERN_ERR TTM_PFX "    default_caching: 0x%08X\n",
@@ -20366,7 +20368,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.36.nouveau/driver
  	}
 diff -Naur linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo_manager.c linux-2.6.36.nouveau/drivers/gpu/drm/ttm/ttm_bo_manager.c
 --- linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo_manager.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/ttm/ttm_bo_manager.c	2010-10-22 23:59:52.632455388 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/ttm/ttm_bo_manager.c	2010-10-24 22:05:10.835405698 +0200
 @@ -0,0 +1,148 @@
 +/**************************************************************************
 + *
@@ -20518,7 +20520,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo_manager.c linux-2.6.36.nouvea
 +EXPORT_SYMBOL(ttm_bo_manager_func);
 diff -Naur linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo_util.c linux-2.6.36.nouveau/drivers/gpu/drm/ttm/ttm_bo_util.c
 --- linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo_util.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/ttm/ttm_bo_util.c	2010-10-22 23:59:52.632455388 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/ttm/ttm_bo_util.c	2010-10-24 22:05:10.835405698 +0200
 @@ -39,14 +39,7 @@
  
  void ttm_bo_free_old_node(struct ttm_buffer_object *bo)
@@ -20547,7 +20549,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/ttm/ttm_bo_util.c linux-2.6.36.nouveau/d
  	}
 diff -Naur linux-2.6.36/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c linux-2.6.36.nouveau/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c
 --- linux-2.6.36/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c	2010-10-22 23:59:52.633455401 +0200
++++ linux-2.6.36.nouveau/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c	2010-10-24 22:05:10.836405709 +0200
 @@ -147,6 +147,7 @@
  		break;
  	case TTM_PL_VRAM:
@@ -20567,7 +20569,7 @@ diff -Naur linux-2.6.36/drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c linux-2.6.36.nouv
  		break;
 diff -Naur linux-2.6.36/include/drm/nouveau_drm.h linux-2.6.36.nouveau/include/drm/nouveau_drm.h
 --- linux-2.6.36/include/drm/nouveau_drm.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/include/drm/nouveau_drm.h	2010-10-22 23:59:52.634455414 +0200
++++ linux-2.6.36.nouveau/include/drm/nouveau_drm.h	2010-10-24 22:05:10.838405731 +0200
 @@ -80,6 +80,8 @@
  #define NOUVEAU_GETPARAM_VM_VRAM_BASE    12
  #define NOUVEAU_GETPARAM_GRAPH_UNITS     13
@@ -20600,7 +20602,7 @@ diff -Naur linux-2.6.36/include/drm/nouveau_drm.h linux-2.6.36.nouveau/include/d
  	uint32_t handle;
 diff -Naur linux-2.6.36/include/drm/ttm/ttm_bo_api.h linux-2.6.36.nouveau/include/drm/ttm/ttm_bo_api.h
 --- linux-2.6.36/include/drm/ttm/ttm_bo_api.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/include/drm/ttm/ttm_bo_api.h	2010-10-22 23:59:52.634455414 +0200
++++ linux-2.6.36.nouveau/include/drm/ttm/ttm_bo_api.h	2010-10-24 22:05:10.839405742 +0200
 @@ -102,7 +102,8 @@
   */
  
@@ -20613,7 +20615,7 @@ diff -Naur linux-2.6.36/include/drm/ttm/ttm_bo_api.h linux-2.6.36.nouveau/includ
  	uint32_t page_alignment;
 diff -Naur linux-2.6.36/include/drm/ttm/ttm_bo_driver.h linux-2.6.36.nouveau/include/drm/ttm/ttm_bo_driver.h
 --- linux-2.6.36/include/drm/ttm/ttm_bo_driver.h	2010-10-20 22:30:22.000000000 +0200
-+++ linux-2.6.36.nouveau/include/drm/ttm/ttm_bo_driver.h	2010-10-22 23:59:52.636455439 +0200
++++ linux-2.6.36.nouveau/include/drm/ttm/ttm_bo_driver.h	2010-10-24 22:05:10.841405764 +0200
 @@ -203,7 +203,22 @@
   * It's set up by the ttm_bo_driver::init_mem_type method.
   */