aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 23:36:17 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-19 23:36:17 -0400
commitc00046c279a2521075250fad682ca0acc10d4fd7 (patch)
tree78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /CREDITS
parent9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff)
parent8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits) fix do_sys_open() prototype sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake Documentation: Fix typo in SubmitChecklist. Typo: depricated -> deprecated Add missing profile=kvm option to Documentation/kernel-parameters.txt fix typo about TBI in e1000 comment proc.txt: Add /proc/stat field small documentation fixes Fix compiler warning in smount example program from sharedsubtree.txt docs/sysfs: add missing word to sysfs attribute explanation documentation/ext3: grammar fixes Documentation/java.txt: typo and grammar fixes Documentation/filesystems/vfs.txt: typo fix include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros trivial copy_data_pages() tidy up Fix typo in arch/x86/kernel/tsc_32.c file link fix for Pegasus USB net driver help remove unused return within void return function Typo fixes retrun -> return x86 hpet.h: remove broken links ...
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS12
1 files changed, 6 insertions, 6 deletions
diff --git a/CREDITS b/CREDITS
index 99566b1a6eeb..ee909f2cc49e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -959,7 +959,7 @@ S: 2037 Walnut #6
959S: Boulder, Colorado 80302 959S: Boulder, Colorado 80302
960S: USA 960S: USA
961 961
962N: Heiko Eissfeldt 962N: Heiko Eißfeldt
963E: heiko@colossus.escape.de heiko@unifix.de 963E: heiko@colossus.escape.de heiko@unifix.de
964D: verify_area stuff, generic SCSI fixes 964D: verify_area stuff, generic SCSI fixes
965D: SCSI Programming HOWTO 965D: SCSI Programming HOWTO
@@ -1988,8 +1988,8 @@ N: Volker Lendecke
1988E: vl@kki.org 1988E: vl@kki.org
1989D: Kernel smbfs (to mount WfW, NT and OS/2 network drives.) 1989D: Kernel smbfs (to mount WfW, NT and OS/2 network drives.)
1990D: NCP filesystem support (to mount NetWare volumes) 1990D: NCP filesystem support (to mount NetWare volumes)
1991S: Von Ossietzky Str. 12 1991S: Von-Ossietzky-Str. 12
1992S: 37085 Goettingen 1992S: 37085 Göttingen
1993S: Germany 1993S: Germany
1994 1994
1995N: Kevin Lentin 1995N: Kevin Lentin
@@ -2431,11 +2431,11 @@ S: 12725 SW Millikan Way, Suite 400
2431S: Beaverton, Oregon 97005 2431S: Beaverton, Oregon 97005
2432S: USA 2432S: USA
2433 2433
2434N: Eberhard Moenkeberg 2434N: Eberhard Mönkeberg
2435E: emoenke@gwdg.de 2435E: emoenke@gwdg.de
2436D: CDROM driver "sbpcd" (Matsushita/Panasonic/Soundblaster) 2436D: CDROM driver "sbpcd" (Matsushita/Panasonic/Soundblaster)
2437S: Ruhstrathoehe 2 b. 2437S: Ruhstrathöhe 2 b.
2438S: D-37085 Goettingen 2438S: D-37085 Göttingen
2439S: Germany 2439S: Germany
2440 2440
2441N: Thomas Molina 2441N: Thomas Molina