From 44fb259c62c95f15516f65a961483476ad226ff6 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Tue, 11 Nov 2008 07:39:53 -0200
Subject: 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>
---
 linux/Documentation/video4linux/bttv/CONTRIBUTORS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'linux/Documentation/video4linux')

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
-- 
cgit v1.2.3