Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
Linus Torvalds [Fri, 6 Jan 2006 23:25:08 +0000 (15:25 -0800)]
1  2 
MAINTAINERS
drivers/media/video/tda9840.c
drivers/media/video/tea6415c.c
drivers/media/video/tea6420.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge