summaryrefslogtreecommitdiff
path: root/linux/Documentation/video4linux/bttv
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-11-20 10:58:02 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-11-20 10:58:02 -0200
commit4bed69bfcb36161bcd89a7a61b6a912c32fea813 (patch)
treeb40092bb4cc41424343b1a4fd3d90b63f7f01fb3 /linux/Documentation/video4linux/bttv
parentf7addb7035dedd9ba701c586fec16b234dde4a77 (diff)
parentc6f9ed52d0eb5d04c1c65914976d81315a872839 (diff)
downloadmediapointer-dvb-s2-4bed69bfcb36161bcd89a7a61b6a912c32fea813.tar.gz
mediapointer-dvb-s2-4bed69bfcb36161bcd89a7a61b6a912c32fea813.tar.bz2
merge: http://linuxtv.org/hg/~pinchartl/uvcvideo
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/Documentation/video4linux/bttv')
-rw-r--r--linux/Documentation/video4linux/bttv/CONTRIBUTORS2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/Documentation/video4linux/bttv/CONTRIBUTORS b/linux/Documentation/video4linux/bttv/CONTRIBUTORS
index 8aad6dd93..eb41b2650 100644
--- a/linux/Documentation/video4linux/bttv/CONTRIBUTORS
+++ b/linux/Documentation/video4linux/bttv/CONTRIBUTORS
@@ -3,7 +3,7 @@ Contributors to bttv:
Michael Chu <mmchu@pobox.com>
AverMedia fix and more flexible card recognition
-Alan Cox <alan@redhat.com>
+Alan Cox <alan@lxorguk.ukuu.org.uk>
Video4Linux interface and 2.1.x kernel adaptation
Chris Kleitsch