diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-04 15:58:00 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-03-04 15:58:00 +0100 |
commit | 1c2af4968ea533e875d7cf8d095c084f18164f5d (patch) | |
tree | f8bb9989ff0a770a1324ed3a44acace3c35de63d /drivers/media/dvb-frontends/nxt200x.c | |
parent | a2fa301fddfcb614568a74317fe9b935dd980045 (diff) | |
parent | 56041bf920d2937b7cadcb30cb206f0372eee814 (diff) | |
download | lwn-1c2af4968ea533e875d7cf8d095c084f18164f5d.tar.gz lwn-1c2af4968ea533e875d7cf8d095c084f18164f5d.zip |
Merge tag 'kvm-for-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into kvm-next
Diffstat (limited to 'drivers/media/dvb-frontends/nxt200x.c')
-rw-r--r-- | drivers/media/dvb-frontends/nxt200x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb-frontends/nxt200x.c b/drivers/media/dvb-frontends/nxt200x.c index 4bf057544607..8a8e1ecb762d 100644 --- a/drivers/media/dvb-frontends/nxt200x.c +++ b/drivers/media/dvb-frontends/nxt200x.c @@ -2,7 +2,7 @@ * Support for NXT2002 and NXT2004 - VSB/QAM * * Copyright (C) 2005 Kirk Lapray <kirk.lapray@gmail.com> - * Copyright (C) 2006 Michael Krufky <mkrufky@m1k.net> + * Copyright (C) 2006-2014 Michael Krufky <mkrufky@linuxtv.org> * based on nxt2002 by Taylor Jacob <rtjacob@earthlink.net> * and nxt2004 by Jean-Francois Thibert <jeanfrancois@sagetv.com> * |