git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
[safe/jmp/linux-2.6]
/
CREDITS
diff --git
a/CREDITS
b/CREDITS
index
9a93e3e
..
1a41bf4
100644
(file)
--- a/
CREDITS
+++ b/
CREDITS
@@
-1253,6
+1253,10
@@
S: 8124 Constitution Apt. 7
S: Sterling Heights, Michigan 48313
S: USA
S: Sterling Heights, Michigan 48313
S: USA
+N: Wolfgang Grandegger
+E: wg@grandegger.com
+D: Controller Area Network (device drivers)
+
N: William Greathouse
E: wgreathouse@smva.com
E: wgreathouse@myfavoritei.com
N: William Greathouse
E: wgreathouse@smva.com
E: wgreathouse@myfavoritei.com
@@
-1412,8
+1416,8
@@
P: 1024D/77D4FC9B F5C5 1C20 1DFC DEC3 3107 54A4 2332 ADFC 77D4 FC9B
D: National Language Support
D: Linux Internationalization Project
D: German Localization for Linux and GNU software
D: National Language Support
D: Linux Internationalization Project
D: German Localization for Linux and GNU software
-S:
Kriemhildring 12a
-S:
65795 Hattersheim am Main
+S:
Auf der Fittel 18
+S:
53347 Alfter
S: Germany
N: Christoph Hellwig
S: Germany
N: Christoph Hellwig
@@
-1852,7
+1856,7
@@
E: rfkoenig@immd4.informatik.uni-erlangen.de
D: The Linux Support Team Erlangen
N: Andreas Koensgen
D: The Linux Support Team Erlangen
N: Andreas Koensgen
-E: ajk@
iehk.rwth-aach
en.de
+E: ajk@
comnets.uni-brem
en.de
D: 6pack driver for AX.25
N: Harald Koerfgen
D: 6pack driver for AX.25
N: Harald Koerfgen
@@
-2002,6
+2006,9
@@
E: paul@laufernet.com
D: Soundblaster driver fixes, ISAPnP quirk
S: California, USA
D: Soundblaster driver fixes, ISAPnP quirk
S: California, USA
+N: Jonathan Layes
+D: ARPD support
+
N: Tom Lees
E: tom@lpsg.demon.co.uk
W: http://www.lpsg.demon.co.uk/
N: Tom Lees
E: tom@lpsg.demon.co.uk
W: http://www.lpsg.demon.co.uk/
@@
-3580,6
+3587,12
@@
N: Dirk Verworner
D: Co-author of German book ``Linux-Kernel-Programmierung''
D: Co-founder of Berlin Linux User Group
D: Co-author of German book ``Linux-Kernel-Programmierung''
D: Co-founder of Berlin Linux User Group
+N: Riku Voipio
+E: riku.voipio@iki.fi
+D: Author of PCA9532 LED and Fintek f75375s hwmon driver
+D: Some random ARM board patches
+S: Finland
+
N: Patrick Volkerding
E: volkerdi@ftp.cdrom.com
D: Produced the Slackware distribution, updated the SVGAlib
N: Patrick Volkerding
E: volkerdi@ftp.cdrom.com
D: Produced the Slackware distribution, updated the SVGAlib
@@
-3792,6
+3805,9
@@
S: van Bronckhorststraat 12
S: 2612 XV Delft
S: The Netherlands
S: 2612 XV Delft
S: The Netherlands
+N: Thomas Woller
+D: CS461x Cirrus Logic sound driver
+
N: David Woodhouse
E: dwmw2@infradead.org
D: JFFS2 file system, Memory Technology Device subsystem,
N: David Woodhouse
E: dwmw2@infradead.org
D: JFFS2 file system, Memory Technology Device subsystem,