Merge master.kernel.org:/pub/scm/linux/kernel/git/bunk/trivial
Linus Torvalds [Mon, 7 Nov 2005 17:01:32 +0000 (09:01 -0800)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge