aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2007-03-22 18:44:17 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-04-27 14:45:06 -0400
commit77d5140fe78ca628bfc9d2567c35457481f9c63d (patch)
tree45697d47e1a2a89fb97a190607b7390220a47075
parent7f7b12f09be8e396d159800baeaf922df46e25cf (diff)
V4L/DVB (5469a): Copyright and maintainer tweaks
Fix up Cafe/ov7670 copyrights and maintainer entries Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--MAINTAINERS12
-rw-r--r--drivers/media/video/cafe_ccic.c1
-rw-r--r--drivers/media/video/ov7670.c2
3 files changed, 15 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 456a3dbcc447..8a2f2fd5403e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -873,6 +873,12 @@ W: http://linuxtv.org
873T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git 873T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
874S: Maintained 874S: Maintained
875 875
876CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
877P: Jonathan Corbet
878M: corbet@lwn.net
879L: video4linux-list@redhat.com
880S: Maintained
881
876CALGARY x86-64 IOMMU 882CALGARY x86-64 IOMMU
877P: Muli Ben-Yehuda 883P: Muli Ben-Yehuda
878M: muli@il.ibm.com 884M: muli@il.ibm.com
@@ -2526,6 +2532,12 @@ P: Harald Welte
2526M: laforge@gnumonks.org 2532M: laforge@gnumonks.org
2527S: Maintained 2533S: Maintained
2528 2534
2535OMNIVISION OV7670 SENSOR DRIVER
2536P: Jonathan Corbet
2537M: corbet@lwn.net
2538L: video4linux-list@redhat.com
2539S: Maintained
2540
2529ONSTREAM SCSI TAPE DRIVER 2541ONSTREAM SCSI TAPE DRIVER
2530P: Willem Riede 2542P: Willem Riede
2531M: osst@riede.org 2543M: osst@riede.org
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 4aa360b89ada..59fd760a52ac 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -4,6 +4,7 @@
4 * sensor. 4 * sensor.
5 * 5 *
6 * Copyright 2006 One Laptop Per Child Association, Inc. 6 * Copyright 2006 One Laptop Per Child Association, Inc.
7 * Copyright 2006-7 Jonathan Corbet <corbet@lwn.net>
7 * 8 *
8 * Written by Jonathan Corbet, corbet@lwn.net. 9 * Written by Jonathan Corbet, corbet@lwn.net.
9 * 10 *
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c
index 1e3c87a08430..639fc2367832 100644
--- a/drivers/media/video/ov7670.c
+++ b/drivers/media/video/ov7670.c
@@ -5,6 +5,8 @@
5 * by Jonathan Corbet with substantial inspiration from Mark 5 * by Jonathan Corbet with substantial inspiration from Mark
6 * McClelland's ovcamchip code. 6 * McClelland's ovcamchip code.
7 * 7 *
8 * Copyright 2006-7 Jonathan Corbet <corbet@lwn.net>
9 *
8 * This file may be distributed under the terms of the GNU General 10 * This file may be distributed under the terms of the GNU General
9 * Public License, version 2. 11 * Public License, version 2.
10 */ 12 */