Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
Paul Mundt [Mon, 15 Nov 2010 04:54:00 +0000 (13:54 +0900)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge