Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 23 Dec 2007 21:06:49 +0000 (13:06 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 23 Dec 2007 21:06:49 +0000 (13:06 -0800)
commit5356f664e1d2149b67d2aeed644cc1def128a4ac
tree8af6289553a71b193082657d508998f828020c95
parentaaa594cd11c6dff4e3545602be1aadd79969f953
parentd172f4ef31bec924c6ebcb242c9d7d290811e1e5
Merge git://git./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
MAINTAINERS