Merge master.kernel.org:/home/rmk/linux-2.6-arm
Linus Torvalds [Mon, 7 Nov 2005 00:58:11 +0000 (16:58 -0800)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge