summaryrefslogtreecommitdiffstats
path: root/Documentation/dvb/contributors.txt
diff options
context:
space:
mode:
authorJody McIntyre <scjody@modernduck.com>2005-12-12 23:34:32 -0500
committerJody McIntyre <scjody@modernduck.com>2005-12-12 23:34:32 -0500
commit525352eb6d355bef6adf597252fc6d04f2dbe66c (patch)
tree4d2b42372ec0ac985f2775b0ea260c707e93fdd4 /Documentation/dvb/contributors.txt
parentd51e86c18a479f1dbcef3aa20e58ad04d1233016 (diff)
parent0e670506668a43e1355b8f10c33d081a676bd521 (diff)
downloadlinux-525352eb6d355bef6adf597252fc6d04f2dbe66c.tar.gz
linux-525352eb6d355bef6adf597252fc6d04f2dbe66c.tar.bz2
linux-525352eb6d355bef6adf597252fc6d04f2dbe66c.zip
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'Documentation/dvb/contributors.txt')
-rw-r--r--Documentation/dvb/contributors.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/dvb/contributors.txt b/Documentation/dvb/contributors.txt
index 2cbd2d0f6fdf..4c33cced5f65 100644
--- a/Documentation/dvb/contributors.txt
+++ b/Documentation/dvb/contributors.txt
@@ -15,7 +15,7 @@ Michael Holzt <kju@debian.org>
Diego Picciani <d.picciani@novacomp.it>
for CyberLogin for Linux which allows logging onto EON
- (in case you are wondering where CyberLogin is, EON changed its login
+ (in case you are wondering where CyberLogin is, EON changed its login
procedure and CyberLogin is no longer used.)
Martin Schaller <martin@smurf.franken.de>
@@ -57,7 +57,7 @@ Augusto Cardoso <augusto@carhil.net>
Davor Emard <emard@softhome.net>
for his work on the budget drivers, the demux code,
the module unloading problems, ...
-
+
Hans-Frieder Vogt <hfvogt@arcor.de>
for his work on calculating and checking the crc's for the
TechnoTrend/Hauppauge DEC driver firmware