diff -Naur -X linux-2.6.31-rc4/Documentation/dontdiff linux-2.6.31-rc4/Documentation/filesystems/sysfs.txt linux-2.6.31-rc4-driver-core.current/Documentation/filesystems/sysfs.txt
--- linux-2.6.31-rc4/Documentation/filesystems/sysfs.txt	2009-03-24 09:43:48.000000000 -0700
+++ linux-2.6.31-rc4-driver-core.current/Documentation/filesystems/sysfs.txt	2009-07-27 20:00:46.000000000 -0700
@@ -23,7 +23,8 @@
 Using sysfs
 ~~~~~~~~~~~
 
-sysfs is always compiled in. You can access it by doing:
+sysfs is always compiled in if CONFIG_SYSFS is defined. You can access
+it by doing:
 
     mount -t sysfs sysfs /sys 
 
diff -Naur -X linux-2.6.31-rc4/Documentation/dontdiff linux-2.6.31-rc4/drivers/base/firmware_class.c linux-2.6.31-rc4-driver-core.current/drivers/base/firmware_class.c
--- linux-2.6.31-rc4/drivers/base/firmware_class.c	2009-07-24 11:07:31.000000000 -0700
+++ linux-2.6.31-rc4-driver-core.current/drivers/base/firmware_class.c	2009-07-27 20:00:46.000000000 -0700
@@ -180,7 +180,6 @@
 				goto err;
 			}
 			/* Pages will be freed by vfree() */
-			fw_priv->pages = NULL;
 			fw_priv->page_array_size = 0;
 			fw_priv->nr_pages = 0;
 			complete(&fw_priv->completion);
diff -Naur -X linux-2.6.31-rc4/Documentation/dontdiff linux-2.6.31-rc4/drivers/base/sys.c linux-2.6.31-rc4-driver-core.current/drivers/base/sys.c
--- linux-2.6.31-rc4/drivers/base/sys.c	2009-07-24 11:07:31.000000000 -0700
+++ linux-2.6.31-rc4-driver-core.current/drivers/base/sys.c	2009-07-27 20:00:46.000000000 -0700
@@ -275,9 +275,9 @@
 				drv->add(sysdev);
 		}
 		mutex_unlock(&sysdev_drivers_lock);
+		kobject_uevent(&sysdev->kobj, KOBJ_ADD);
 	}
 
-	kobject_uevent(&sysdev->kobj, KOBJ_ADD);
 	return error;
 }
 
diff -Naur -X linux-2.6.31-rc4/Documentation/dontdiff linux-2.6.31-rc4/fs/sysfs/dir.c linux-2.6.31-rc4-driver-core.current/fs/sysfs/dir.c
--- linux-2.6.31-rc4/fs/sysfs/dir.c	2009-06-15 12:15:51.000000000 -0700
+++ linux-2.6.31-rc4-driver-core.current/fs/sysfs/dir.c	2009-07-27 20:00:46.000000000 -0700
@@ -939,8 +939,10 @@
 	/* Remove from old parent's list and insert into new parent's list. */
 	sysfs_unlink_sibling(sd);
 	sysfs_get(new_parent_sd);
+	drop_nlink(old_parent->d_inode);
 	sysfs_put(sd->s_parent);
 	sd->s_parent = new_parent_sd;
+	inc_nlink(new_parent->d_inode);
 	sysfs_link_sibling(sd);
 
  out_unlock:
diff -Naur -X linux-2.6.31-rc4/Documentation/dontdiff linux-2.6.31-rc4/lib/dynamic_debug.c linux-2.6.31-rc4-driver-core.current/lib/dynamic_debug.c
--- linux-2.6.31-rc4/lib/dynamic_debug.c	2009-06-15 12:15:53.000000000 -0700
+++ linux-2.6.31-rc4-driver-core.current/lib/dynamic_debug.c	2009-07-27 20:00:46.000000000 -0700
@@ -164,7 +164,7 @@
 
 			if (!newflags)
 				dt->num_enabled--;
-			else if (!dp-flags)
+			else if (!dp->flags)
 				dt->num_enabled++;
 			dp->flags = newflags;
 			if (newflags) {