Commit 5356f664 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents aaa594cd d172f4ef

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -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

kernel/params.c

+10 −0
Original line number Diff line number Diff line
@@ -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,

};



/*