Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  Modules: fix memory leak of module names
  UIO: Add a MAINTAINERS entry for Userspace I/O

2 files changed, 18 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 907094f07142..3d567fd2e0a1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4054,6 +4054,14 @@ L:	user-mode-linux-user@lists.sourceforge.net
 W:      http://user-mode-linux.sourceforge.net
 S:      Maintained
 
+USERSPACE I/O (UIO)
+P:      Hans J. Koch
+M:      hjk@linutronix.de
+P:      Greg Kroah-Hartman
+M:      gregkh@suse.de
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
 FAT/VFAT/MSDOS FILESYSTEM:
 P:      OGAWA Hirofumi
 M:      hirofumi@mail.parknet.co.jp
diff --git a/kernel/params.c b/kernel/params.c
index 2a4c51487e72..7686417ee00e 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -697,8 +697,18 @@ static struct kset_uevent_ops module_uevent_ops = {
 decl_subsys(module, &module_ktype, &module_uevent_ops);
 int module_sysfs_initialized;
 
+static void module_release(struct kobject *kobj)
+{
+        /*
+         * Stupid empty release function to allow the memory for the kobject to
+         * be properly cleaned up.  This will not need to be present for 2.6.25
+         * with the upcoming kobject core rework.
+         */
+}
+
 static struct kobj_type module_ktype = {
         .sysfs_ops =    &module_sysfs_ops,
+        .release =      module_release,
 };
 
 /*