Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Russell King [Fri, 4 Dec 2009 17:34:50 +0000 (17:34 +0000)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge