tree 8af6289553a71b193082657d508998f828020c95
parent aaa594cd11c6dff4e3545602be1aadd79969f953
parent d172f4ef31bec924c6ebcb242c9d7d290811e1e5
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1198444009 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1198444009 -0800

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