]> err.no Git - linux-2.6/commitdiff
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)
* 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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge