Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Jan 2006 23:25:08 +0000 (15:25 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 6 Jan 2006 23:25:08 +0000 (15:25 -0800)
commit0feb9bfcfa3f9bf67a4a1e3f2608700ad73f92ed
tree22c71657387b42787bc070502899a881ed909f39
parentd8d8f6a4fd635dcc9e4f946394c1fbde85eeab66
parentccf18968b1bbc2fb117190a1984ac2a826dac228
Merge /pub/scm/linux/kernel/git/gregkh/i2c-2.6
MAINTAINERS
drivers/media/video/tda9840.c
drivers/media/video/tea6415c.c
drivers/media/video/tea6420.c