summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-09 21:33:05 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-09 21:33:05 +0100
commitc97f68145e8067b3ac4b126a6faebf90f9ffc302 (patch)
treeeb2060681552a00e9efa98224b95f69a3dc84390 /MAINTAINERS
parentb1add0480a95b6ceaece5caf6c50614771eae9b2 (diff)
parent7bff3c4ce44ea48f50dc47a5994454984bd08c59 (diff)
downloadlinux-c97f68145e8067b3ac4b126a6faebf90f9ffc302.tar.gz
linux-c97f68145e8067b3ac4b126a6faebf90f9ffc302.tar.bz2
linux-c97f68145e8067b3ac4b126a6faebf90f9ffc302.zip
Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git
Merge branch 'davinci' into devel
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 4f7b64a824ae..c77df0f449de 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4377,7 +4377,7 @@ S: Maintained
USB VIDEO CLASS
P: Laurent Pinchart
M: laurent.pinchart@skynet.be
-L: linx-uvc-devel@berlios.de
+L: linux-uvc-devel@lists.berlios.de
L: video4linux-list@redhat.com
W: http://linux-uvc.berlios.de
S: Maintained