diff options
author | pboettcher@dibcom68.dibcom.fr <pboettcher@dibcom68.dibcom.fr> | 2006-04-07 09:31:51 +0200 |
---|---|---|
committer | pboettcher@dibcom68.dibcom.fr <pboettcher@dibcom68.dibcom.fr> | 2006-04-07 09:31:51 +0200 |
commit | f62b12acad6cf4c6e78bc2dd7e3e445f2d239d24 (patch) | |
tree | a73819bc4ad336cafcf90648613eabd96cc23f7f /linux/drivers/media/video/em28xx/em28xx-input.c | |
parent | 3cdabc5516eb8974b43dc1febf8010d550c1de65 (diff) | |
parent | 2fec184983c06bf36e79ddae3c2ddf2d8ab61f2d (diff) | |
download | mediapointer-dvb-s2-f62b12acad6cf4c6e78bc2dd7e3e445f2d239d24.tar.gz mediapointer-dvb-s2-f62b12acad6cf4c6e78bc2dd7e3e445f2d239d24.tar.bz2 |
merge: from main
From: Patrick Boettcher <pb@linuxtv.org>
merge: from main
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Diffstat (limited to 'linux/drivers/media/video/em28xx/em28xx-input.c')
-rw-r--r-- | linux/drivers/media/video/em28xx/em28xx-input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/em28xx/em28xx-input.c b/linux/drivers/media/video/em28xx/em28xx-input.c index a8d3cd4b0..38fe35da8 100644 --- a/linux/drivers/media/video/em28xx/em28xx-input.c +++ b/linux/drivers/media/video/em28xx/em28xx-input.c @@ -3,7 +3,7 @@ Copyright (C) 2005 Ludovico Cavedon <cavedon@sssup.it> Markus Rechberger <mrechberger@gmail.com> - Mauro Carvalho Chehab <mchehab@brturbo.com.br> + Mauro Carvalho Chehab <mchehab@infradead.org> Sascha Sommer <saschasommer@freenet.de> This program is free software; you can redistribute it and/or modify |