Merge ../linux-2.6
Mauro Carvalho Chehab [Sun, 27 Jul 2008 15:25:57 +0000 (12:25 -0300)]
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge