Merge branch 'origin'
authorMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 6 Feb 2006 12:43:13 +0000 (10:43 -0200)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 6 Feb 2006 12:43:13 +0000 (10:43 -0200)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge