Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

author Linus Torvalds <torvalds@g5.osdl.org>

Fri, 6 Jan 2006 23:25:08 +0000 (15:25 -0800)

committer Linus Torvalds <torvalds@g5.osdl.org>

Fri, 6 Jan 2006 23:25:08 +0000 (15:25 -0800)
author Linus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Jan 2006 23:25:08 +0000 (15:25 -0800)
committer Linus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Jan 2006 23:25:08 +0000 (15:25 -0800)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/media/video/tda9840.c
Simple merge
diff --cc drivers/media/video/tea6415c.c
Simple merge
diff --cc drivers/media/video/tea6420.c
Simple merge
author	Linus Torvalds <torvalds@g5.osdl.org>
	Fri, 6 Jan 2006 23:25:08 +0000 (15:25 -0800)
committer	Linus Torvalds <torvalds@g5.osdl.org>
	Fri, 6 Jan 2006 23:25:08 +0000 (15:25 -0800)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/video/tda9840.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/video/tea6415c.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/video/tea6420.c	patch \|	diff1 \|	diff2 \|	blob \| history