Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Felix Blyakher [Mon, 9 Feb 2009 15:34:45 +0000 (09:34 -0600)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge