summaryrefslogtreecommitdiff
path: root/linux/Documentation/video4linux
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-11-11 07:39:53 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-11-11 07:39:53 -0200
commit44fb259c62c95f15516f65a961483476ad226ff6 (patch)
treef21dc593a3bae6bdc39109a22f784deae3087dc2 /linux/Documentation/video4linux
parent28615ed3424329580117e65a34106ca408bf564b (diff)
downloadmediapointer-dvb-s2-44fb259c62c95f15516f65a961483476ad226ff6.tar.gz
mediapointer-dvb-s2-44fb259c62c95f15516f65a961483476ad226ff6.tar.bz2
Backport a few minor changes from upstream
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/Documentation/video4linux')
-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