summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb/tm6000/tm6000-dvb.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2014-05-15 01:49:19 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2014-05-15 01:49:19 +0200
commit879f99ef2c4c05d9a7f0a67a05f1415663119825 (patch)
tree0399664761f675eef741f8b08b92635069586151 /drivers/media/usb/tm6000/tm6000-dvb.c
parentInput: pmic8xxx-pwrkey - set sane default for debounce time (diff)
parentLinux 3.15-rc5 (diff)
downloadlinux-879f99ef2c4c05d9a7f0a67a05f1415663119825.tar.xz
linux-879f99ef2c4c05d9a7f0a67a05f1415663119825.zip
Merge tag 'v3.15-rc5' into next
Merge with Linux 3.15-rc5 to sync up Wacom and other changes.
Diffstat (limited to 'drivers/media/usb/tm6000/tm6000-dvb.c')
-rw-r--r--drivers/media/usb/tm6000/tm6000-dvb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/usb/tm6000/tm6000-dvb.c b/drivers/media/usb/tm6000/tm6000-dvb.c
index 9fc1e940a82b..095f5db1a790 100644
--- a/drivers/media/usb/tm6000/tm6000-dvb.c
+++ b/drivers/media/usb/tm6000/tm6000-dvb.c
@@ -32,7 +32,7 @@
#include "xc5000.h"
MODULE_DESCRIPTION("DVB driver extension module for tm5600/6000/6010 based TV cards");
-MODULE_AUTHOR("Mauro Carvalho Chehab <mchehab@redhat.com>");
+MODULE_AUTHOR("Mauro Carvalho Chehab");
MODULE_LICENSE("GPL");
MODULE_SUPPORTED_DEVICE("{{Trident, tm5600},"