aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 16:33:14 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-26 16:33:14 -0400
commitda206c9e68cb93fcab43592d46276c02889c1250 (patch)
tree21264cc26fa0322d668b398808f10bd93558d25f /CREDITS
parent916d15445f4ad2a9018e5451760734f36083be77 (diff)
parent2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: typo fixes Clean up 'inline is not at beginning' warnings for usb storage Storage class should be first i386: Trivial typo fixes ixj: make ixj_set_tone_off() static spelling fixes fix paniced->panicked typos Spelling fixes for Documentation/atomic_ops.txt move acknowledgment for Mark Adler to CREDITS remove the bouncing email address of David Campbell
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS5
1 files changed, 5 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 1d35f10ec3..85c7c70b70 100644
--- a/CREDITS
+++ b/CREDITS
@@ -24,6 +24,11 @@ S: C. Negri 6, bl. D3
24S: Iasi 6600 24S: Iasi 6600
25S: Romania 25S: Romania
26 26
27N: Mark Adler
28E: madler@alumni.caltech.edu
29W: http://alumnus.caltech.edu/~madler/
30D: zlib decompression
31
27N: Monalisa Agrawal 32N: Monalisa Agrawal
28E: magrawal@nortelnetworks.com 33E: magrawal@nortelnetworks.com
29D: Basic Interphase 5575 driver with UBR and ABR support. 34D: Basic Interphase 5575 driver with UBR and ABR support.