diff -urN oldtree/arch/i386/defconfig newtree/arch/i386/defconfig
--- oldtree/arch/i386/defconfig	2006-10-07 10:37:54.000000000 -0400
+++ newtree/arch/i386/defconfig	2006-10-07 12:13:10.000000000 -0400
@@ -165,7 +165,6 @@
 # CONFIG_NOHIGHMEM is not set
 CONFIG_HIGHMEM4G=y
 # CONFIG_HIGHMEM64G is not set
-CONFIG_BADRAM=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_HIGHMEM=y
 CONFIG_ARCH_POPULATES_NODE_MAP=y
diff -urN oldtree/drivers/rtc/rtc-ds1307.c newtree/drivers/rtc/rtc-ds1307.c
--- oldtree/drivers/rtc/rtc-ds1307.c	2006-10-05 15:36:57.000000000 -0400
+++ newtree/drivers/rtc/rtc-ds1307.c	2006-10-07 12:26:05.000000000 -0400
@@ -141,9 +141,9 @@
 
 	dev_dbg(dev, "%s secs=%d, mins=%d, "
 		"hours=%d, mday=%d, mon=%d, year=%d, wday=%d\n",
-		"write", dt->tm_sec, dt->tm_min,
-		dt->tm_hour, dt->tm_mday,
-		dt->tm_mon, dt->tm_year, dt->tm_wday);
+		"write", t->tm_sec, t->tm_min,
+		t->tm_hour, t->tm_mday,
+		t->tm_mon, t->tm_year, t->tm_wday);
 
 	*buf++ = 0;		/* first register addr */
 	buf[DS1307_REG_SECS] = BIN2BCD(t->tm_sec);
diff -urN oldtree/drivers/rtc/rtc-ds1672.c newtree/drivers/rtc/rtc-ds1672.c
--- oldtree/drivers/rtc/rtc-ds1672.c	2006-10-05 15:36:57.000000000 -0400
+++ newtree/drivers/rtc/rtc-ds1672.c	2006-10-07 12:34:45.000000000 -0400
@@ -54,10 +54,6 @@
 		return -EIO;
 	}
 
-	dev_dbg(&client->dev,
-		"%s: raw read data - counters=%02x,%02x,%02x,%02x\n"
-		__FUNCTION__, buf[0], buf[1], buf[2], buf[3]);
-
 	time = (buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
 
 	rtc_time_to_tm(time, tm);
@@ -156,7 +152,7 @@
 }
 static DEVICE_ATTR(control, S_IRUGO, show_control, NULL);
 
-static const struct rtc_class_ops ds1672_rtc_ops = {
+static struct rtc_class_ops ds1672_rtc_ops = {
 	.read_time	= ds1672_rtc_read_time,
 	.set_time	= ds1672_rtc_set_time,
 	.set_mmss	= ds1672_rtc_set_mmss,
diff -urN oldtree/kernel/sysctl.c newtree/kernel/sysctl.c
--- oldtree/kernel/sysctl.c	2006-10-07 10:37:55.000000000 -0400
+++ newtree/kernel/sysctl.c	2006-10-07 12:03:09.000000000 -0400
@@ -94,6 +94,11 @@
 static int one = 1;
 #endif
 
+/* USB Mouse Polling */
+#if defined(CONFIG_USB_HID)
+extern int hid_mousepoll_interval;
+#endif
+
 /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
 static int maxolduid = 65535;
 static int minolduid;
diff -urN oldtree/mm/filemap.c newtree/mm/filemap.c
--- oldtree/mm/filemap.c	2006-10-07 10:37:55.000000000 -0400
+++ newtree/mm/filemap.c	2006-10-07 11:53:01.000000000 -0400
@@ -1048,8 +1048,8 @@
  */
 static int large_isize(unsigned long nr_pages)
 {
-	if (nr_pages * 6 > total_pages) {
-		 unsigned long unmapped_ram = total_pages - nr_mapped();
+	if (nr_pages * 6 > vm_total_pages) {
+		 unsigned long unmapped_ram = vm_total_pages - nr_mapped();
 
 		if (nr_pages * 2 > unmapped_ram)
 			return 1;