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

diff --combined MAINTAINERS
index 907094f07142650066457f50b1561a80ceab0328,a06ee4335243436271dddbb70a97c95b413ce873..3d567fd2e0a192476991839c8f3b7f5efd0197c8
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2029,7 -2029,7 +2029,7 @@@ P:      James Ketreno
  M:    jketreno@linux.intel.com
  L:    linux-wireless@vger.kernel.org
  L:    ipw2100-devel@lists.sourceforge.net
 -L:    http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 +W:    http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
  W:    http://ipw2100.sourceforge.net
  S:    Supported
  
@@@ -2040,7 -2040,7 +2040,7 @@@ P:      James Ketreno
  M:    jketreno@linux.intel.com
  L:    linux-wireless@vger.kernel.org
  L:    ipw2100-devel@lists.sourceforge.net
 -L:    http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 +W:    http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
  W:    http://ipw2200.sourceforge.net
  S:    Supported
  
@@@ -2597,7 -2597,7 +2597,7 @@@ S:      Maintaine
  MSI LAPTOP SUPPORT
  P:    Lennart Poettering
  M:    mzxreary@0pointer.de
 -L:    https://tango.0pointer.de/mailman/listinfo/s270-linux
 +W:    https://tango.0pointer.de/mailman/listinfo/s270-linux
  W:    http://0pointer.de/lennart/tchibo.html
  S:    Maintained
  
@@@ -4054,6 -4054,14 +4054,14 @@@ L:    user-mode-linux-user@lists.sourcefor
  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