Merge with http://www.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Adrian Bunk [Mon, 7 Nov 2005 11:26:59 +0000 (12:26 +0100)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge