diff options
author | Linus Torvalds | 2006-06-26 13:33:14 -0700 |
---|---|---|
committer | Linus Torvalds | 2006-06-26 13:33:14 -0700 |
commit | da206c9e68cb93fcab43592d46276c02889c1250 (patch) | |
tree | 21264cc26fa0322d668b398808f10bd93558d25f /CREDITS | |
parent | 916d15445f4ad2a9018e5451760734f36083be77 (diff) | |
parent | 2e2d0dcc1bd7ca7c26ea5e29efb7f34bbd564f1c (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-- | CREDITS | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -24,6 +24,11 @@ S: C. Negri 6, bl. D3 S: Iasi 6600 S: Romania +N: Mark Adler +E: madler@alumni.caltech.edu +W: http://alumnus.caltech.edu/~madler/ +D: zlib decompression + N: Monalisa Agrawal E: magrawal@nortelnetworks.com D: Basic Interphase 5575 driver with UBR and ABR support. |