aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@gmx.de>2007-10-19 17:21:04 -0400
committerAdrian Bunk <bunk@kernel.org>2007-10-19 17:21:04 -0400
commit96de0e252cedffad61b3cb5e05662c591898e69a (patch)
treee3eb7d3e65ec27d39e1da13a17f6f0f91b28f5e9
parent3f5b98a2a0cba3351f96fcaa6d79aa1a0d93ee78 (diff)
Convert files to UTF-8 and some cleanups
* Convert files to UTF-8. * Also correct some people's names (one example is Eißfeldt, which was found in a source file. Given that the author used an ß at all in a source file indicates that the real name has in fact a 'ß' and not an 'ss', which is commonly used as a substitute for 'ß' when limited to 7bit.) * Correct town names (Goettingen -> Göttingen) * Update Eberhard Mönkeberg's address (http://lkml.org/lkml/2007/1/8/313) Signed-off-by: Jan Engelhardt <jengelh@gmx.de> Signed-off-by: Adrian Bunk <bunk@kernel.org>
-rw-r--r--CREDITS12
-rw-r--r--Documentation/cdrom/cdrom-standard.tex2
-rw-r--r--Documentation/isdn/CREDITS2
-rw-r--r--Documentation/spi/pxa2xx2
-rw-r--r--arch/arm/mach-omap1/irq.c2
-rw-r--r--arch/arm/mach-omap2/timer-gp.c2
-rw-r--r--arch/arm/nwfpe/fpopcode.h34
-rw-r--r--arch/arm/plat-omap/dma.c2
-rw-r--r--arch/arm/plat-omap/gpio.c2
-rw-r--r--arch/m68k/ifpsp060/CHANGES2
-rw-r--r--arch/m68k/ifpsp060/MISC2
-rw-r--r--arch/m68k/ifpsp060/README2
-rw-r--r--arch/m68k/ifpsp060/TEST.DOC2
-rw-r--r--arch/m68k/ifpsp060/fplsp.doc2
-rw-r--r--arch/m68k/ifpsp060/fpsp.doc2
-rw-r--r--arch/m68k/ifpsp060/fskeleton.S2
-rw-r--r--arch/m68k/ifpsp060/ilsp.doc2
-rw-r--r--arch/m68k/ifpsp060/iskeleton.S2
-rw-r--r--arch/m68k/ifpsp060/isp.doc2
-rw-r--r--arch/m68k/ifpsp060/os.S2
-rw-r--r--arch/m68k/ifpsp060/src/fplsp.S2
-rw-r--r--arch/m68k/ifpsp060/src/fpsp.S2
-rw-r--r--arch/m68k/ifpsp060/src/ftest.S2
-rw-r--r--arch/m68k/ifpsp060/src/ilsp.S2
-rw-r--r--arch/m68k/ifpsp060/src/isp.S2
-rw-r--r--arch/m68k/ifpsp060/src/itest.S2
-rw-r--r--arch/m68k/ifpsp060/src/pfpsp.S2
-rw-r--r--arch/m68k/tools/amiga/dmesg.c2
-rw-r--r--arch/powerpc/kernel/l2cr_6xx.S2
-rw-r--r--arch/powerpc/platforms/cell/spufs/file.c2
-rw-r--r--arch/x86/kernel/cpu/cpufreq/powernow-k6.c2
-rw-r--r--arch/x86/kernel/cpu/cyrix.c6
-rw-r--r--drivers/block/loop.c2
-rw-r--r--drivers/char/cyclades.c2
-rw-r--r--drivers/char/drm/drm_hashtab.c2
-rw-r--r--drivers/char/drm/drm_hashtab.h2
-rw-r--r--drivers/char/drm/drm_mm.c2
-rw-r--r--drivers/char/drm/drm_pci.c4
-rw-r--r--drivers/char/drm/drm_sarea.h2
-rw-r--r--drivers/char/drm/drm_sman.c2
-rw-r--r--drivers/char/drm/drm_sman.h2
-rw-r--r--drivers/char/drm/r128_drv.h2
-rw-r--r--drivers/char/drm/radeon_irq.c2
-rw-r--r--drivers/char/drm/radeon_state.c2
-rw-r--r--drivers/char/drm/sis_mm.c2
-rw-r--r--drivers/char/drm/via_mm.c2
-rw-r--r--drivers/char/drm/via_verifier.h2
-rw-r--r--drivers/char/esp.c2
-rw-r--r--drivers/char/hw_random/omap-rng.c2
-rw-r--r--drivers/char/i8k.c14
-rw-r--r--drivers/char/sonypi.c2
-rw-r--r--drivers/hwmon/gl520sm.c4
-rw-r--r--drivers/hwmon/sis5595.c2
-rw-r--r--drivers/hwmon/via686a.c4
-rw-r--r--drivers/i2c/algos/i2c-algo-bit.c2
-rw-r--r--drivers/i2c/algos/i2c-algo-pca.c2
-rw-r--r--drivers/i2c/algos/i2c-algo-pcf.c2
-rw-r--r--drivers/i2c/busses/i2c-elektor.c2
-rw-r--r--drivers/i2c/busses/i2c-hydra.c2
-rw-r--r--drivers/i2c/busses/i2c-ibm_iic.c2
-rw-r--r--drivers/i2c/busses/i2c-omap.c2
-rw-r--r--drivers/i2c/busses/i2c-parport-light.c2
-rw-r--r--drivers/i2c/busses/i2c-parport.c2
-rw-r--r--drivers/i2c/busses/i2c-via.c4
-rw-r--r--drivers/i2c/busses/i2c-viapro.c2
-rw-r--r--drivers/i2c/i2c-core.c2
-rw-r--r--drivers/ide/ide-cd.c6
-rw-r--r--drivers/ide/legacy/q40ide.c2
-rw-r--r--drivers/input/joystick/db9.c2
-rw-r--r--drivers/input/keyboard/omap-keypad.c4
-rw-r--r--drivers/isdn/hisax/amd7930_fn.c2
-rw-r--r--drivers/isdn/hisax/enternow_pci.c18
-rw-r--r--drivers/isdn/hisax/hfc_pci.c2
-rw-r--r--drivers/isdn/hisax/isdnhdlc.c4
-rw-r--r--drivers/isdn/hisax/isdnhdlc.h2
-rw-r--r--drivers/isdn/hisax/jade.c2
-rw-r--r--drivers/isdn/pcbit/capi.c4
-rw-r--r--drivers/md/raid1.c2
-rw-r--r--drivers/media/common/saa7146_hlp.c2
-rw-r--r--drivers/media/dvb/cinergyT2/cinergyT2.c2
-rw-r--r--drivers/media/video/bt8xx/bttv-cards.c4
-rw-r--r--drivers/media/video/meye.c2
-rw-r--r--drivers/media/video/meye.h2
-rw-r--r--drivers/media/video/usbvideo/vicam.c2
-rw-r--r--drivers/media/video/v4l2-common.c2
-rw-r--r--drivers/message/i2o/README4
-rw-r--r--drivers/message/i2o/exec-osm.c4
-rw-r--r--drivers/message/i2o/i2o_config.c6
-rw-r--r--drivers/message/i2o/i2o_proc.c4
-rw-r--r--drivers/message/i2o/iop.c4
-rw-r--r--drivers/message/i2o/pci.c4
-rw-r--r--drivers/misc/ibmasm/remote.c2
-rw-r--r--drivers/net/8139too.c2
-rw-r--r--drivers/net/ariadne.c2
-rw-r--r--drivers/net/ariadne.h2
-rw-r--r--drivers/net/hamradio/6pack.c2
-rw-r--r--drivers/net/irda/actisys-sir.c2
-rw-r--r--drivers/net/irda/actisys.c2
-rw-r--r--drivers/net/irda/girbil-sir.c2
-rw-r--r--drivers/net/irda/girbil.c2
-rw-r--r--drivers/net/irda/irport.h2
-rw-r--r--drivers/net/irda/irtty-sir.c2
-rw-r--r--drivers/net/irda/nsc-ircc.c2
-rw-r--r--drivers/net/irda/nsc-ircc.h2
-rw-r--r--drivers/net/irda/tekram-sir.c2
-rw-r--r--drivers/net/irda/tekram.c2
-rw-r--r--drivers/net/irda/w83977af_ir.h2
-rw-r--r--drivers/net/wireless/netwave_cs.c8
-rw-r--r--drivers/s390/block/dasd_3990_erp.c2
-rw-r--r--drivers/s390/cio/cmf.c2
-rw-r--r--drivers/s390/net/ctcmain.c10
-rw-r--r--drivers/scsi/aha152x.c6
-rw-r--r--drivers/scsi/sun3_NCR5380.c2
-rw-r--r--drivers/serial/s3c2410.c4
-rw-r--r--drivers/usb/gadget/lh7a40x_udc.c2
-rw-r--r--drivers/usb/misc/cytherm.c2
-rw-r--r--drivers/usb/misc/emi26.c4
-rw-r--r--drivers/usb/misc/emi62.c4
-rw-r--r--drivers/usb/serial/ChangeLog.history2
-rw-r--r--drivers/usb/serial/ftdi_sio.c2
-rw-r--r--drivers/usb/serial/ftdi_sio.h6
-rw-r--r--drivers/usb/serial/ipaq.c4
-rw-r--r--drivers/usb/storage/isd200.c2
-rw-r--r--drivers/usb/storage/unusual_devs.h4
-rw-r--r--drivers/video/amifb.c14
-rw-r--r--drivers/video/aty/atyfb_base.c2
-rw-r--r--drivers/video/intelfb/intelfbdrv.c2
-rw-r--r--drivers/video/intelfb/intelfbhw.c2
-rw-r--r--drivers/video/s3c2410fb.c4
-rw-r--r--drivers/watchdog/i6300esb.c6
-rw-r--r--drivers/watchdog/iTCO_vendor_support.c2
-rw-r--r--drivers/watchdog/w83697hf_wdt.c2
-rw-r--r--drivers/zorro/zorro.ids2
-rw-r--r--fs/binfmt_em86.c2
-rw-r--r--fs/binfmt_misc.c2
-rw-r--r--fs/binfmt_script.c2
-rw-r--r--fs/isofs/inode.c2
-rw-r--r--fs/nfs/nfsroot.c2
-rw-r--r--fs/ntfs/ChangeLog2
-rw-r--r--fs/ntfs/sysctl.c2
-rw-r--r--fs/ntfs/sysctl.h2
-rw-r--r--fs/super.c2
-rw-r--r--include/asm-arm/arch-aaec2000/aaec2000.h4
-rw-r--r--include/linux/cdrom.h2
-rw-r--r--net/ax25/ax25_ds_in.c2
-rw-r--r--net/ax25/ax25_ds_subr.c2
-rw-r--r--net/bluetooth/bnep/core.c2
-rw-r--r--net/bluetooth/bnep/netdev.c2
-rw-r--r--net/bridge/netfilter/ebtables.c2
-rw-r--r--net/core/pktgen.c2
-rw-r--r--net/irda/iriap.c2
-rw-r--r--net/irda/iriap_event.c2
-rw-r--r--net/irda/irias_object.c2
-rw-r--r--net/irda/irlan/irlan_client.c2
-rw-r--r--net/irda/irlan/irlan_common.c2
-rw-r--r--net/irda/irlan/irlan_eth.c2
-rw-r--r--net/irda/irlan/irlan_event.c2
-rw-r--r--net/irda/irlan/irlan_provider.c2
-rw-r--r--net/irda/irlan/irlan_provider_event.c2
-rw-r--r--net/irda/irlap_event.c2
-rw-r--r--net/irda/irlap_frame.c2
-rw-r--r--net/irda/irlmp.c2
-rw-r--r--net/irda/irlmp_event.c2
-rw-r--r--net/irda/irlmp_frame.c2
-rw-r--r--net/irda/irmod.c2
-rw-r--r--net/irda/irqueue.c2
-rw-r--r--net/irda/irsysctl.c2
-rw-r--r--net/irda/irttp.c2
168 files changed, 248 insertions, 248 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
diff --git a/Documentation/cdrom/cdrom-standard.tex b/Documentation/cdrom/cdrom-standard.tex
index 92f94e597582..c713aeb020c4 100644
--- a/Documentation/cdrom/cdrom-standard.tex
+++ b/Documentation/cdrom/cdrom-standard.tex
@@ -1009,7 +1009,7 @@ taken over the torch in maintaining \cdromc\ and integrating much
1009\cdrom-related code in the 2.1-kernel. Thanks to Scott Snyder and 1009\cdrom-related code in the 2.1-kernel. Thanks to Scott Snyder and
1010Gerd Knorr, who were the first to implement this interface for SCSI 1010Gerd Knorr, who were the first to implement this interface for SCSI
1011and IDE-CD drivers and added many ideas for extension of the data 1011and IDE-CD drivers and added many ideas for extension of the data
1012structures relative to kernel~2.0. Further thanks to Heiko Eissfeldt, 1012structures relative to kernel~2.0. Further thanks to Heiko Ei{\sz}feldt,
1013Thomas Quinot, Jon Tombs, Ken Pizzini, Eberhard M\"onkeberg and Andrew 1013Thomas Quinot, Jon Tombs, Ken Pizzini, Eberhard M\"onkeberg and Andrew
1014Kroll, the \linux\ \cdrom\ device driver developers who were kind 1014Kroll, the \linux\ \cdrom\ device driver developers who were kind
1015enough to give suggestions and criticisms during the writing. Finally 1015enough to give suggestions and criticisms during the writing. Finally
diff --git a/Documentation/isdn/CREDITS b/Documentation/isdn/CREDITS
index 7c17c837064f..8cac6c2f23ee 100644
--- a/Documentation/isdn/CREDITS
+++ b/Documentation/isdn/CREDITS
@@ -40,7 +40,7 @@ Andreas Kool (akool@Kool.f.EUnet.de)
40Pedro Roque Marques (roque@di.fc.ul.pt) 40Pedro Roque Marques (roque@di.fc.ul.pt)
41 For lot of new ideas and the pcbit driver. 41 For lot of new ideas and the pcbit driver.
42 42
43Eberhard Moenkeberg (emoenke@gwdg.de) 43Eberhard Mönkeberg (emoenke@gwdg.de)
44 For testing and help to get into kernel. 44 For testing and help to get into kernel.
45 45
46Thomas Neumann (tn@ruhr.de) 46Thomas Neumann (tn@ruhr.de)
diff --git a/Documentation/spi/pxa2xx b/Documentation/spi/pxa2xx
index 215e3b8e7266..f3853cc37bde 100644
--- a/Documentation/spi/pxa2xx
+++ b/Documentation/spi/pxa2xx
@@ -1,4 +1,4 @@
1PXA2xx SPI on SSP driver HOWTO 1PXA2xx SPI on SSP driver HOWTO
2=================================================== 2===================================================
3This a mini howto on the pxa2xx_spi driver. The driver turns a PXA2xx 3This a mini howto on the pxa2xx_spi driver. The driver turns a PXA2xx
4synchronous serial port into a SPI master controller 4synchronous serial port into a SPI master controller
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c
index 0733078940fa..1da9d59a0347 100644
--- a/arch/arm/mach-omap1/irq.c
+++ b/arch/arm/mach-omap1/irq.c
@@ -5,7 +5,7 @@
5 * 5 *
6 * Copyright (C) 2004 Nokia Corporation 6 * Copyright (C) 2004 Nokia Corporation
7 * Written by Tony Lindgren <tony@atomide.com> 7 * Written by Tony Lindgren <tony@atomide.com>
8 * Major cleanups by Juha Yrjl <juha.yrjola@nokia.com> 8 * Major cleanups by Juha Yrjölä <juha.yrjola@nokia.com>
9 * 9 *
10 * Completely re-written to support various OMAP chips with bank specific 10 * Completely re-written to support various OMAP chips with bank specific
11 * interrupt handlers. 11 * interrupt handlers.
diff --git a/arch/arm/mach-omap2/timer-gp.c b/arch/arm/mach-omap2/timer-gp.c
index 62e801ef9ad9..8d322c20ccae 100644
--- a/arch/arm/mach-omap2/timer-gp.c
+++ b/arch/arm/mach-omap2/timer-gp.c
@@ -5,7 +5,7 @@
5 * 5 *
6 * Copyright (C) 2005 Nokia Corporation 6 * Copyright (C) 2005 Nokia Corporation
7 * Author: Paul Mundt <paul.mundt@nokia.com> 7 * Author: Paul Mundt <paul.mundt@nokia.com>
8 * Juha Yrjl <juha.yrjola@nokia.com> 8 * Juha Yrjölä <juha.yrjola@nokia.com>
9 * OMAP Dual-mode timer framework support by Timo Teras 9 * OMAP Dual-mode timer framework support by Timo Teras
10 * 10 *
11 * Some parts based off of TI's 24xx code: 11 * Some parts based off of TI's 24xx code:
diff --git a/arch/arm/nwfpe/fpopcode.h b/arch/arm/nwfpe/fpopcode.h
index 0090b19bbe61..786e4c96156d 100644
--- a/arch/arm/nwfpe/fpopcode.h
+++ b/arch/arm/nwfpe/fpopcode.h
@@ -78,11 +78,11 @@ TABLE 1
78+-------------------------+---+---+---------+---------+ 78+-------------------------+---+---+---------+---------+
79| Precision | u | v | FPSR.EP | length | 79| Precision | u | v | FPSR.EP | length |
80+-------------------------+---+---+---------+---------+ 80+-------------------------+---+---+---------+---------+
81| Single | 0 0 | x | 1 words | 81| Single | 0 | 0 | x | 1 words |
82| Double | 1 1 | x | 2 words | 82| Double | 1 | 1 | x | 2 words |
83| Extended | 1 1 | x | 3 words | 83| Extended | 1 | 1 | x | 3 words |
84| Packed decimal | 1 1 | 0 | 3 words | 84| Packed decimal | 1 | 1 | 0 | 3 words |
85| Expanded packed decimal | 1 1 | 1 | 4 words | 85| Expanded packed decimal | 1 | 1 | 1 | 4 words |
86+-------------------------+---+---+---------+---------+ 86+-------------------------+---+---+---------+---------+
87Note: x = don't care 87Note: x = don't care
88*/ 88*/
@@ -92,10 +92,10 @@ TABLE 2
92+---+---+---------------------------------+ 92+---+---+---------------------------------+
93| w | x | Number of registers to transfer | 93| w | x | Number of registers to transfer |
94+---+---+---------------------------------+ 94+---+---+---------------------------------+
95| 0 1 | 1 | 95| 0 | 1 | 1 |
96| 1 0 | 2 | 96| 1 | 0 | 2 |
97| 1 1 | 3 | 97| 1 | 1 | 3 |
98| 0 0 | 4 | 98| 0 | 0 | 4 |
99+---+---+---------------------------------+ 99+---+---+---------------------------------+
100*/ 100*/
101 101
@@ -156,10 +156,10 @@ TABLE 5
156+-------------------------+---+---+ 156+-------------------------+---+---+
157| Rounding Precision | e | f | 157| Rounding Precision | e | f |
158+-------------------------+---+---+ 158+-------------------------+---+---+
159| IEEE Single precision | 0 0 | 159| IEEE Single precision | 0 | 0 |
160| IEEE Double precision | 0 1 | 160| IEEE Double precision | 0 | 1 |
161| IEEE Extended precision | 1 0 | 161| IEEE Extended precision | 1 | 0 |
162| undefined (trap) | 1 1 | 162| undefined (trap) | 1 | 1 |
163+-------------------------+---+---+ 163+-------------------------+---+---+
164*/ 164*/
165 165
@@ -168,10 +168,10 @@ TABLE 5
168+---------------------------------+---+---+ 168+---------------------------------+---+---+
169| Rounding Mode | g | h | 169| Rounding Mode | g | h |
170+---------------------------------+---+---+ 170+---------------------------------+---+---+
171| Round to nearest (default) | 0 0 | 171| Round to nearest (default) | 0 | 0 |
172| Round toward plus infinity | 0 1 | 172| Round toward plus infinity | 0 | 1 |
173| Round toward negative infinity | 1 0 | 173| Round toward negative infinity | 1 | 0 |
174| Round toward zero | 1 1 | 174| Round toward zero | 1 | 1 |
175+---------------------------------+---+---+ 175+---------------------------------+---+---+
176*/ 176*/
177 177
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 05a38498cbe0..dcbba07cf98a 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -2,7 +2,7 @@
2 * linux/arch/arm/plat-omap/dma.c 2 * linux/arch/arm/plat-omap/dma.c
3 * 3 *
4 * Copyright (C) 2003 Nokia Corporation 4 * Copyright (C) 2003 Nokia Corporation
5 * Author: Juha Yrjl <juha.yrjola@nokia.com> 5 * Author: Juha Yrjölä <juha.yrjola@nokia.com>
6 * DMA channel linking for 1610 by Samuel Ortiz <samuel.ortiz@nokia.com> 6 * DMA channel linking for 1610 by Samuel Ortiz <samuel.ortiz@nokia.com>
7 * Graphics DMA and LCD DMA graphics tranformations 7 * Graphics DMA and LCD DMA graphics tranformations
8 * by Imre Deak <imre.deak@nokia.com> 8 * by Imre Deak <imre.deak@nokia.com>
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 337455dfe64d..6097753394ad 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -4,7 +4,7 @@
4 * Support functions for OMAP GPIO 4 * Support functions for OMAP GPIO
5 * 5 *
6 * Copyright (C) 2003-2005 Nokia Corporation 6 * Copyright (C) 2003-2005 Nokia Corporation
7 * Written by Juha Yrjl <juha.yrjola@nokia.com> 7 * Written by Juha Yrjölä <juha.yrjola@nokia.com>
8 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License version 2 as 10 * it under the terms of the GNU General Public License version 2 as
diff --git a/arch/m68k/ifpsp060/CHANGES b/arch/m68k/ifpsp060/CHANGES
index c1e712dfc2e7..ba96596910fd 100644
--- a/arch/m68k/ifpsp060/CHANGES
+++ b/arch/m68k/ifpsp060/CHANGES
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/MISC b/arch/m68k/ifpsp060/MISC
index b7e644b94ae2..1a63913daa16 100644
--- a/arch/m68k/ifpsp060/MISC
+++ b/arch/m68k/ifpsp060/MISC
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/README b/arch/m68k/ifpsp060/README
index e3bced429bd3..f6f8f5c59419 100644
--- a/arch/m68k/ifpsp060/README
+++ b/arch/m68k/ifpsp060/README
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/TEST.DOC b/arch/m68k/ifpsp060/TEST.DOC
index 5e5900cb2dc4..1ba3aef1500f 100644
--- a/arch/m68k/ifpsp060/TEST.DOC
+++ b/arch/m68k/ifpsp060/TEST.DOC
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/fplsp.doc b/arch/m68k/ifpsp060/fplsp.doc
index fb637c436762..89730a934c5e 100644
--- a/arch/m68k/ifpsp060/fplsp.doc
+++ b/arch/m68k/ifpsp060/fplsp.doc
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/fpsp.doc b/arch/m68k/ifpsp060/fpsp.doc
index 408315209e62..23d513f72ed9 100644
--- a/arch/m68k/ifpsp060/fpsp.doc
+++ b/arch/m68k/ifpsp060/fpsp.doc
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/fskeleton.S b/arch/m68k/ifpsp060/fskeleton.S
index a45a4ff9d2af..0a1ae4f44130 100644
--- a/arch/m68k/ifpsp060/fskeleton.S
+++ b/arch/m68k/ifpsp060/fskeleton.S
@@ -4,7 +4,7 @@
4|M68060 Software Package 4|M68060 Software Package
5|Production Release P1.00 -- October 10, 1994 5|Production Release P1.00 -- October 10, 1994
6| 6|
7|M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7|M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8| 8|
9|THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9|THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10|To the maximum extent permitted by applicable law, 10|To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/ilsp.doc b/arch/m68k/ifpsp060/ilsp.doc
index f6fae6d900ae..4e6292f095aa 100644
--- a/arch/m68k/ifpsp060/ilsp.doc
+++ b/arch/m68k/ifpsp060/ilsp.doc
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/iskeleton.S b/arch/m68k/ifpsp060/iskeleton.S
index b2dbdf5ee309..91a9c65fee8a 100644
--- a/arch/m68k/ifpsp060/iskeleton.S
+++ b/arch/m68k/ifpsp060/iskeleton.S
@@ -4,7 +4,7 @@
4|M68060 Software Package 4|M68060 Software Package
5|Production Release P1.00 -- October 10, 1994 5|Production Release P1.00 -- October 10, 1994
6| 6|
7|M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7|M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8| 8|
9|THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9|THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10|To the maximum extent permitted by applicable law, 10|To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/isp.doc b/arch/m68k/ifpsp060/isp.doc
index 5a90fded3f0b..9dadd727fc50 100644
--- a/arch/m68k/ifpsp060/isp.doc
+++ b/arch/m68k/ifpsp060/isp.doc
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/os.S b/arch/m68k/ifpsp060/os.S
index aa4df87a6c42..7a0d6e428066 100644
--- a/arch/m68k/ifpsp060/os.S
+++ b/arch/m68k/ifpsp060/os.S
@@ -4,7 +4,7 @@
4|M68060 Software Package 4|M68060 Software Package
5|Production Release P1.00 -- October 10, 1994 5|Production Release P1.00 -- October 10, 1994
6| 6|
7|M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7|M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8| 8|
9|THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9|THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10|To the maximum extent permitted by applicable law, 10|To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/src/fplsp.S b/arch/m68k/ifpsp060/src/fplsp.S
index fdb79b927ef1..3b7ea2dc9f1b 100644
--- a/arch/m68k/ifpsp060/src/fplsp.S
+++ b/arch/m68k/ifpsp060/src/fplsp.S
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/src/fpsp.S b/arch/m68k/ifpsp060/src/fpsp.S
index 3b597a9bbf43..6c1a9a217887 100644
--- a/arch/m68k/ifpsp060/src/fpsp.S
+++ b/arch/m68k/ifpsp060/src/fpsp.S
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/src/ftest.S b/arch/m68k/ifpsp060/src/ftest.S
index 2edcbae0fd53..1f947915d81e 100644
--- a/arch/m68k/ifpsp060/src/ftest.S
+++ b/arch/m68k/ifpsp060/src/ftest.S
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/src/ilsp.S b/arch/m68k/ifpsp060/src/ilsp.S
index afa7422cddb5..970abaf3303e 100644
--- a/arch/m68k/ifpsp060/src/ilsp.S
+++ b/arch/m68k/ifpsp060/src/ilsp.S
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/src/isp.S b/arch/m68k/ifpsp060/src/isp.S
index b269091d9df6..6dccda766e22 100644
--- a/arch/m68k/ifpsp060/src/isp.S
+++ b/arch/m68k/ifpsp060/src/isp.S
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/src/itest.S b/arch/m68k/ifpsp060/src/itest.S
index ba4a30cbcbea..beca47e7d514 100644
--- a/arch/m68k/ifpsp060/src/itest.S
+++ b/arch/m68k/ifpsp060/src/itest.S
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/ifpsp060/src/pfpsp.S b/arch/m68k/ifpsp060/src/pfpsp.S
index 0c997c436beb..51b9f7d879dd 100644
--- a/arch/m68k/ifpsp060/src/pfpsp.S
+++ b/arch/m68k/ifpsp060/src/pfpsp.S
@@ -4,7 +4,7 @@ M68000 Hi-Performance Microprocessor Division
4M68060 Software Package 4M68060 Software Package
5Production Release P1.00 -- October 10, 1994 5Production Release P1.00 -- October 10, 1994
6 6
7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved. 7M68060 Software Package Copyright 1993, 1994 Motorola Inc. All rights reserved.
8 8
9THE SOFTWARE is provided on an "AS IS" basis and without warranty. 9THE SOFTWARE is provided on an "AS IS" basis and without warranty.
10To the maximum extent permitted by applicable law, 10To the maximum extent permitted by applicable law,
diff --git a/arch/m68k/tools/amiga/dmesg.c b/arch/m68k/tools/amiga/dmesg.c
index e892748e7386..7340f5b6cf6d 100644
--- a/arch/m68k/tools/amiga/dmesg.c
+++ b/arch/m68k/tools/amiga/dmesg.c
@@ -3,7 +3,7 @@
3 * in Chip RAM with the kernel command 3 * in Chip RAM with the kernel command
4 * line option `debug=mem'. 4 * line option `debug=mem'.
5 * 5 *
6 * Copyright 1996 by Geert Uytterhoeven <geert@linux-m68k.org> 6 * Copyright 1996 by Geert Uytterhoeven <geert@linux-m68k.org>
7 * 7 *
8 * 8 *
9 * Usage: 9 * Usage:
diff --git a/arch/powerpc/kernel/l2cr_6xx.S b/arch/powerpc/kernel/l2cr_6xx.S
index 858f28ac8a06..2a2f3c3f6d80 100644
--- a/arch/powerpc/kernel/l2cr_6xx.S
+++ b/arch/powerpc/kernel/l2cr_6xx.S
@@ -1,6 +1,6 @@
1/* 1/*
2 L2CR functions 2 L2CR functions
3 Copyright 1997-1998 by PowerLogix R & D, Inc. 3 Copyright 1997-1998 by PowerLogix R & D, Inc.
4 4
5 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
6 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index d72b16d6816e..d9e56a503795 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -748,7 +748,7 @@ static ssize_t spufs_wbox_write(struct file *file, const char __user *buf,
748 if (count) 748 if (count)
749 goto out; 749 goto out;
750 750
751 /* write aѕ much as possible */ 751 /* write as much as possible */
752 for (count = 4, udata++; (count + 4) <= len; count += 4, udata++) { 752 for (count = 4, udata++; (count + 4) <= len; count += 4, udata++) {
753 int ret; 753 int ret;
754 ret = __get_user(wbox_data, udata); 754 ret = __get_user(wbox_data, udata);
diff --git a/arch/x86/kernel/cpu/cpufreq/powernow-k6.c b/arch/x86/kernel/cpu/cpufreq/powernow-k6.c
index 6d0285339317..a07f6d84033a 100644
--- a/arch/x86/kernel/cpu/cpufreq/powernow-k6.c
+++ b/arch/x86/kernel/cpu/cpufreq/powernow-k6.c
@@ -1,6 +1,6 @@
1/* 1/*
2 * This file was based upon code in Powertweak Linux (http://powertweak.sf.net) 2 * This file was based upon code in Powertweak Linux (http://powertweak.sf.net)
3 * (C) 2000-2003 Dave Jones, Arjan van de Ven, Janne Pnkl, Dominik Brodowski. 3 * (C) 2000-2003 Dave Jones, Arjan van de Ven, Janne Pänkälä, Dominik Brodowski.
4 * 4 *
5 * Licensed under the terms of the GNU GPL License version 2. 5 * Licensed under the terms of the GNU GPL License version 2.
6 * 6 *
diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c
index 122d2d75aa9f..65fa636f410e 100644
--- a/arch/x86/kernel/cpu/cyrix.c
+++ b/arch/x86/kernel/cpu/cyrix.c
@@ -115,9 +115,9 @@ static void __cpuinit set_cx86_reorder(void)
115 115
116 printk(KERN_INFO "Enable Memory access reorder on Cyrix/NSC processor.\n"); 116 printk(KERN_INFO "Enable Memory access reorder on Cyrix/NSC processor.\n");
117 ccr3 = getCx86(CX86_CCR3); 117 ccr3 = getCx86(CX86_CCR3);
118 setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */ 118 setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */
119 119
120 /* Load/Store Serialize to mem access disable (=reorder it) */ 120 /* Load/Store Serialize to mem access disable (=reorder it) */
121 setCx86(CX86_PCR0, getCx86(CX86_PCR0) & ~0x80); 121 setCx86(CX86_PCR0, getCx86(CX86_PCR0) & ~0x80);
122 /* set load/store serialize from 1GB to 4GB */ 122 /* set load/store serialize from 1GB to 4GB */
123 ccr3 |= 0xe0; 123 ccr3 |= 0xe0;
@@ -146,7 +146,7 @@ static void __cpuinit set_cx86_inc(void)
146 printk(KERN_INFO "Enable Incrementor on Cyrix/NSC processor.\n"); 146 printk(KERN_INFO "Enable Incrementor on Cyrix/NSC processor.\n");
147 147
148 ccr3 = getCx86(CX86_CCR3); 148 ccr3 = getCx86(CX86_CCR3);
149 setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */ 149 setCx86(CX86_CCR3, (ccr3 & 0x0f) | 0x10); /* enable MAPEN */
150 /* PCR1 -- Performance Control */ 150 /* PCR1 -- Performance Control */
151 /* Incrementor on, whatever that is */ 151 /* Incrementor on, whatever that is */
152 setCx86(CX86_PCR1, getCx86(CX86_PCR1) | 0x02); 152 setCx86(CX86_PCR1, getCx86(CX86_PCR1) | 0x02);
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 589cbbd9cd4f..56e23042728a 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -29,7 +29,7 @@
29 * 29 *
30 * Maximum number of loop devices when compiled-in now selectable by passing 30 * Maximum number of loop devices when compiled-in now selectable by passing
31 * max_loop=<1-255> to the kernel on boot. 31 * max_loop=<1-255> to the kernel on boot.
32 * Erik I. Bols, <eriki@himolde.no>, Oct 31, 1999 32 * Erik I. Bolsø, <eriki@himolde.no>, Oct 31, 1999
33 * 33 *
34 * Completely rewrite request handling to be make_request_fn style and 34 * Completely rewrite request handling to be make_request_fn style and
35 * non blocking, pushing work to a helper thread. Lots of fixes from 35 * non blocking, pushing work to a helper thread. Lots of fixes from
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c
index d15234c5965e..523a6b4a3697 100644
--- a/drivers/char/cyclades.c
+++ b/drivers/char/cyclades.c
@@ -359,7 +359,7 @@
359 * 359 *
360 * Revision 1.36.3.8 1996/06/07 16:29:00 bentson 360 * Revision 1.36.3.8 1996/06/07 16:29:00 bentson
361 * starting minor number at zero; added missing verify_area 361 * starting minor number at zero; added missing verify_area
362 * as noted by Heiko Eissfeldt <heiko@colossus.escape.de> 362 * as noted by Heiko Eißfeldt <heiko@colossus.escape.de>
363 * 363 *
364 * Revision 1.36.3.7 1996/04/19 21:06:18 bentson 364 * Revision 1.36.3.7 1996/04/19 21:06:18 bentson
365 * remove unneeded boot message & fix CLOCAL hardware flow 365 * remove unneeded boot message & fix CLOCAL hardware flow
diff --git a/drivers/char/drm/drm_hashtab.c b/drivers/char/drm/drm_hashtab.c
index 3ad319070704..4b8e7db5a232 100644
--- a/drivers/char/drm/drm_hashtab.c
+++ b/drivers/char/drm/drm_hashtab.c
@@ -29,7 +29,7 @@
29 * Simple open hash tab implementation. 29 * Simple open hash tab implementation.
30 * 30 *
31 * Authors: 31 * Authors:
32 * Thomas Hellstrm <thomas-at-tungstengraphics-dot-com> 32 * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
33 */ 33 */
34 34
35#include "drmP.h" 35#include "drmP.h"
diff --git a/drivers/char/drm/drm_hashtab.h b/drivers/char/drm/drm_hashtab.h
index 0f1376774168..573e333ac457 100644
--- a/drivers/char/drm/drm_hashtab.h
+++ b/drivers/char/drm/drm_hashtab.h
@@ -29,7 +29,7 @@
29 * Simple open hash tab implementation. 29 * Simple open hash tab implementation.
30 * 30 *
31 * Authors: 31 * Authors:
32 * Thomas Hellstrm <thomas-at-tungstengraphics-dot-com> 32 * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
33 */ 33 */
34 34
35#ifndef DRM_HASHTAB_H 35#ifndef DRM_HASHTAB_H
diff --git a/drivers/char/drm/drm_mm.c b/drivers/char/drm/drm_mm.c
index 3e6bc14f7441..86f4eb61a6a4 100644
--- a/drivers/char/drm/drm_mm.c
+++ b/drivers/char/drm/drm_mm.c
@@ -38,7 +38,7 @@
38 * Aligned allocations can also see improvement. 38 * Aligned allocations can also see improvement.
39 * 39 *
40 * Authors: 40 * Authors:
41 * Thomas Hellstrm <thomas-at-tungstengraphics-dot-com> 41 * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
42 */ 42 */
43 43
44#include "drmP.h" 44#include "drmP.h"
diff --git a/drivers/char/drm/drm_pci.c b/drivers/char/drm/drm_pci.c
index e292bb0eaca2..b55d5bc6ea61 100644
--- a/drivers/char/drm/drm_pci.c
+++ b/drivers/char/drm/drm_pci.c
@@ -8,12 +8,12 @@
8 * \todo Implement the remaining ioctl's for the PCI pools. 8 * \todo Implement the remaining ioctl's for the PCI pools.
9 * \todo The wrappers here are so thin that they would be better off inlined.. 9 * \todo The wrappers here are so thin that they would be better off inlined..
10 * 10 *
11 * \author Jose Fonseca <jrfonseca@tungstengraphics.com> 11 * \author José Fonseca <jrfonseca@tungstengraphics.com>
12 * \author Leif Delgass <ldelgass@retinalburn.net> 12 * \author Leif Delgass <ldelgass@retinalburn.net>
13 */ 13 */
14 14
15/* 15/*
16 * Copyright 2003 JosFonseca. 16 * Copyright 2003 José Fonseca.
17 * Copyright 2003 Leif Delgass. 17 * Copyright 2003 Leif Delgass.
18 * All Rights Reserved. 18 * All Rights Reserved.
19 * 19 *
diff --git a/drivers/char/drm/drm_sarea.h b/drivers/char/drm/drm_sarea.h
index f5466966081e..e040f47f369f 100644
--- a/drivers/char/drm/drm_sarea.h
+++ b/drivers/char/drm/drm_sarea.h
@@ -2,7 +2,7 @@
2 * \file drm_sarea.h 2 * \file drm_sarea.h
3 * \brief SAREA definitions 3 * \brief SAREA definitions
4 * 4 *
5 * \author Michel Dnzer <michel@daenzer.net> 5 * \author Michel Dänzer <michel@daenzer.net>
6 */ 6 */
7 7
8/* 8/*
diff --git a/drivers/char/drm/drm_sman.c b/drivers/char/drm/drm_sman.c
index 8421a93946d8..926f146390ce 100644
--- a/drivers/char/drm/drm_sman.c
+++ b/drivers/char/drm/drm_sman.c
@@ -33,7 +33,7 @@
33 * struct or a context identifier. 33 * struct or a context identifier.
34 * 34 *
35 * Authors: 35 * Authors:
36 * Thomas Hellstrm <thomas-at-tungstengraphics-dot-com> 36 * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
37 */ 37 */
38 38
39#include "drm_sman.h" 39#include "drm_sman.h"
diff --git a/drivers/char/drm/drm_sman.h b/drivers/char/drm/drm_sman.h
index 39a39fefeef1..08ecf83ad5d4 100644
--- a/drivers/char/drm/drm_sman.h
+++ b/drivers/char/drm/drm_sman.h
@@ -33,7 +33,7 @@
33 * struct or a context identifier. 33 * struct or a context identifier.
34 * 34 *
35 * Authors: 35 * Authors:
36 * Thomas Hellstrm <thomas-at-tungstengraphics-dot-com> 36 * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
37 */ 37 */
38 38
39#ifndef DRM_SMAN_H 39#ifndef DRM_SMAN_H
diff --git a/drivers/char/drm/r128_drv.h b/drivers/char/drm/r128_drv.h
index 250d2aa46581..5041bd8dbed8 100644
--- a/drivers/char/drm/r128_drv.h
+++ b/drivers/char/drm/r128_drv.h
@@ -29,7 +29,7 @@
29 * Rickard E. (Rik) Faith <faith@valinux.com> 29 * Rickard E. (Rik) Faith <faith@valinux.com>
30 * Kevin E. Martin <martin@valinux.com> 30 * Kevin E. Martin <martin@valinux.com>
31 * Gareth Hughes <gareth@valinux.com> 31 * Gareth Hughes <gareth@valinux.com>
32 * Michel Dzer <daenzerm@student.ethz.ch> 32 * Michel Dänzer <daenzerm@student.ethz.ch>
33 */ 33 */
34 34
35#ifndef __R128_DRV_H__ 35#ifndef __R128_DRV_H__
diff --git a/drivers/char/drm/radeon_irq.c b/drivers/char/drm/radeon_irq.c
index 2b2407ee490e..84f5bc36252b 100644
--- a/drivers/char/drm/radeon_irq.c
+++ b/drivers/char/drm/radeon_irq.c
@@ -27,7 +27,7 @@
27 * 27 *
28 * Authors: 28 * Authors:
29 * Keith Whitwell <keith@tungstengraphics.com> 29 * Keith Whitwell <keith@tungstengraphics.com>
30 * Michel Dzer <michel@daenzer.net> 30 * Michel Dänzer <michel@daenzer.net>
31 */ 31 */
32 32
33#include "drmP.h" 33#include "drmP.h"
diff --git a/drivers/char/drm/radeon_state.c b/drivers/char/drm/radeon_state.c
index 69c9f2febf43..f824f2f5fdc2 100644
--- a/drivers/char/drm/radeon_state.c
+++ b/drivers/char/drm/radeon_state.c
@@ -3005,7 +3005,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
3005 /* 3005 /*
3006 * This ioctl() doesn't work on 64-bit platforms because hw_lock is a 3006 * This ioctl() doesn't work on 64-bit platforms because hw_lock is a
3007 * pointer which can't fit into an int-sized variable. According to 3007 * pointer which can't fit into an int-sized variable. According to
3008 * Michel Dnzer, the ioctl() is only used on embedded platforms, so 3008 * Michel Dänzer, the ioctl() is only used on embedded platforms, so
3009 * not supporting it shouldn't be a problem. If the same functionality 3009 * not supporting it shouldn't be a problem. If the same functionality
3010 * is needed on 64-bit platforms, a new ioctl() would have to be added, 3010 * is needed on 64-bit platforms, a new ioctl() would have to be added,
3011 * so backwards-compatibility for the embedded platforms can be 3011 * so backwards-compatibility for the embedded platforms can be
diff --git a/drivers/char/drm/sis_mm.c b/drivers/char/drm/sis_mm.c
index 8c66838ff515..6be1c5757580 100644
--- a/drivers/char/drm/sis_mm.c
+++ b/drivers/char/drm/sis_mm.c
@@ -28,7 +28,7 @@
28 28
29/* 29/*
30 * Authors: 30 * Authors:
31 * Thomas Hellstrm <thomas-at-tungstengraphics-dot-com> 31 * Thomas Hellström <thomas-at-tungstengraphics-dot-com>
32 */ 32 */
33 33
34#include "drmP.h" 34#include "drmP.h"
diff --git a/drivers/char/drm/via_mm.c b/drivers/char/drm/via_mm.c
index 9afc1684348d..3ffbf8649833 100644
--- a/drivers/char/drm/via_mm.c
+++ b/drivers/char/drm/via_mm.c
@@ -22,7 +22,7 @@
22 * DEALINGS IN THE SOFTWARE. 22 * DEALINGS IN THE SOFTWARE.
23 */ 23 */
24/* 24/*
25 * Authors: Thomas Hellstrm <thomas-at-tungstengraphics-dot-com> 25 * Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
26 */ 26 */
27 27
28#include "drmP.h" 28#include "drmP.h"
diff --git a/drivers/char/drm/via_verifier.h b/drivers/char/drm/via_verifier.h
index 28b50296a7bd..d6f8214b69f5 100644
--- a/drivers/char/drm/via_verifier.h
+++ b/drivers/char/drm/via_verifier.h
@@ -20,7 +20,7 @@
20 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21 * DEALINGS IN THE SOFTWARE. 21 * DEALINGS IN THE SOFTWARE.
22 * 22 *
23 * Author: Thomas Hellstrm 2004. 23 * Author: Thomas Hellström 2004.
24 */ 24 */
25 25
26#ifndef _VIA_VERIFIER_H_ 26#ifndef _VIA_VERIFIER_H_
diff --git a/drivers/char/esp.c b/drivers/char/esp.c
index 0f8fb135da53..28607763ae64 100644
--- a/drivers/char/esp.c
+++ b/drivers/char/esp.c
@@ -19,7 +19,7 @@
19 * 19 *
20 * rs_set_termios fixed to look also for changes of the input 20 * rs_set_termios fixed to look also for changes of the input
21 * flags INPCK, BRKINT, PARMRK, IGNPAR and IGNBRK. 21 * flags INPCK, BRKINT, PARMRK, IGNPAR and IGNBRK.
22 * Bernd Anhpl 05/17/96. 22 * Bernd Anhäupl 05/17/96.
23 * 23 *
24 * --- End of notices from serial.c --- 24 * --- End of notices from serial.c ---
25 * 25 *
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index e13dd1892bfd..3f35a1c562b1 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -10,7 +10,7 @@
10 * Mostly based on original driver: 10 * Mostly based on original driver:
11 * 11 *
12 * Copyright (C) 2005 Nokia Corporation 12 * Copyright (C) 2005 Nokia Corporation
13 * Author: Juha Yrj��<juha.yrjola@nokia.com> 13 * Author: Juha Yrjölä <juha.yrjola@nokia.com>
14 * 14 *
15 * This file is licensed under the terms of the GNU General Public 15 * This file is licensed under the terms of the GNU General Public
16 * License version 2. This program is licensed "as is" without any 16 * License version 2. This program is licensed "as is" without any
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
index cd406416effd..30e564516422 100644
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
@@ -371,14 +371,14 @@ static int i8k_proc_show(struct seq_file *seq, void *offset)
371 int fn_key, cpu_temp, ac_power; 371 int fn_key, cpu_temp, ac_power;
372 int left_fan, right_fan, left_speed, right_speed; 372 int left_fan, right_fan, left_speed, right_speed;
373 373
374 cpu_temp = i8k_get_temp(0); /* 11100 s */ 374 cpu_temp = i8k_get_temp(0); /* 11100 s */
375 left_fan = i8k_get_fan_status(I8K_FAN_LEFT); /* 580 s */ 375 left_fan = i8k_get_fan_status(I8K_FAN_LEFT); /* 580 s */
376 right_fan = i8k_get_fan_status(I8K_FAN_RIGHT); /* 580 s */ 376 right_fan = i8k_get_fan_status(I8K_FAN_RIGHT); /* 580 s */
377 left_speed = i8k_get_fan_speed(I8K_FAN_LEFT); /* 580 s */ 377 left_speed = i8k_get_fan_speed(I8K_FAN_LEFT); /* 580 s */
378 right_speed = i8k_get_fan_speed(I8K_FAN_RIGHT); /* 580 s */ 378 right_speed = i8k_get_fan_speed(I8K_FAN_RIGHT); /* 580 s */
379 fn_key = i8k_get_fn_status(); /* 750 s */ 379 fn_key = i8k_get_fn_status(); /* 750 s */
380 if (power_status) 380 if (power_status)
381 ac_power = i8k_get_power_status(); /* 14700 s */ 381 ac_power = i8k_get_power_status(); /* 14700 s */
382 else 382 else
383 ac_power = -1; 383 ac_power = -1;
384 384
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index 9782cb4d30dc..877e53dcb996 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -7,7 +7,7 @@
7 * 7 *
8 * Copyright (C) 2005 Narayanan R S <nars@kadamba.org> 8 * Copyright (C) 2005 Narayanan R S <nars@kadamba.org>
9 * 9 *
10 * Copyright (C) 2001-2002 Alcve <www.alcove.com> 10 * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
11 * 11 *
12 * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au> 12 * Copyright (C) 2001 Michael Ashley <m.ashley@unsw.edu.au>
13 * 13 *
diff --git a/drivers/hwmon/gl520sm.c b/drivers/hwmon/gl520sm.c
index a3b56c816e11..2d39d8fc2389 100644
--- a/drivers/hwmon/gl520sm.c
+++ b/drivers/hwmon/gl520sm.c
@@ -2,7 +2,7 @@
2 gl520sm.c - Part of lm_sensors, Linux kernel modules for hardware 2 gl520sm.c - Part of lm_sensors, Linux kernel modules for hardware
3 monitoring 3 monitoring
4 Copyright (c) 1998, 1999 Frodo Looijaard <frodol@dds.nl>, 4 Copyright (c) 1998, 1999 Frodo Looijaard <frodol@dds.nl>,
5 Kysti Mlkki <kmalkki@cc.hut.fi> 5 Kyösti Mälkki <kmalkki@cc.hut.fi>
6 Copyright (c) 2005 Maarten Deprez <maartendeprez@users.sourceforge.net> 6 Copyright (c) 2005 Maarten Deprez <maartendeprez@users.sourceforge.net>
7 7
8 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
@@ -805,7 +805,7 @@ static void __exit sensors_gl520sm_exit(void)
805 805
806 806
807MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, " 807MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl>, "
808 "Kysti Mlkki <kmalkki@cc.hut.fi>, " 808 "Kyösti Mälkki <kmalkki@cc.hut.fi>, "
809 "Maarten Deprez <maartendeprez@users.sourceforge.net>"); 809 "Maarten Deprez <maartendeprez@users.sourceforge.net>");
810MODULE_DESCRIPTION("GL520SM driver"); 810MODULE_DESCRIPTION("GL520SM driver");
811MODULE_LICENSE("GPL"); 811MODULE_LICENSE("GPL");
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 860b71ccbb86..7e2d9787babc 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -3,7 +3,7 @@
3 for hardware monitoring 3 for hardware monitoring
4 4
5 Copyright (C) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>, 5 Copyright (C) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>,
6 Kysti Mlkki <kmalkki@cc.hut.fi>, and 6 Kyösti Mälkki <kmalkki@cc.hut.fi>, and
7 Mark D. Studebaker <mdsxyz123@yahoo.com> 7 Mark D. Studebaker <mdsxyz123@yahoo.com>
8 Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with 8 Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with
9 the help of Jean Delvare <khali@linux-fr.org> 9 the help of Jean Delvare <khali@linux-fr.org>
diff --git a/drivers/hwmon/via686a.c b/drivers/hwmon/via686a.c
index 8f63dada6019..2635bba1e3fc 100644
--- a/drivers/hwmon/via686a.c
+++ b/drivers/hwmon/via686a.c
@@ -3,7 +3,7 @@
3 for hardware monitoring 3 for hardware monitoring
4 4
5 Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>, 5 Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>,
6 Kysti Mlkki <kmalkki@cc.hut.fi>, 6 Kyösti Mälkki <kmalkki@cc.hut.fi>,
7 Mark Studebaker <mdsxyz123@yahoo.com>, 7 Mark Studebaker <mdsxyz123@yahoo.com>,
8 and Bob Dougherty <bobd@stanford.edu> 8 and Bob Dougherty <bobd@stanford.edu>
9 (Some conversion-factor data were contributed by Jonathan Teh Soon Yew 9 (Some conversion-factor data were contributed by Jonathan Teh Soon Yew
@@ -866,7 +866,7 @@ static void __exit sm_via686a_exit(void)
866 } 866 }
867} 867}
868 868
869MODULE_AUTHOR("Kysti Mlkki <kmalkki@cc.hut.fi>, " 869MODULE_AUTHOR("Kyösti Mälkki <kmalkki@cc.hut.fi>, "
870 "Mark Studebaker <mdsxyz123@yahoo.com> " 870 "Mark Studebaker <mdsxyz123@yahoo.com> "
871 "and Bob Dougherty <bobd@stanford.edu>"); 871 "and Bob Dougherty <bobd@stanford.edu>");
872MODULE_DESCRIPTION("VIA 686A Sensor device"); 872MODULE_DESCRIPTION("VIA 686A Sensor device");
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c
index 7f0a0a62cf60..a37cb6b8593c 100644
--- a/drivers/i2c/algos/i2c-algo-bit.c
+++ b/drivers/i2c/algos/i2c-algo-bit.c
@@ -18,7 +18,7 @@
18 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ 18 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
19/* ------------------------------------------------------------------------- */ 19/* ------------------------------------------------------------------------- */
20 20
21/* With some changes from Frodo Looijaard <frodol@dds.nl>, Kysti Mlkki 21/* With some changes from Frodo Looijaard <frodol@dds.nl>, Kyösti Mälkki
22 <kmalkki@cc.hut.fi> and Jean Delvare <khali@linux-fr.org> */ 22 <kmalkki@cc.hut.fi> and Jean Delvare <khali@linux-fr.org> */
23 23
24#include <linux/kernel.h> 24#include <linux/kernel.h>
diff --git a/drivers/i2c/algos/i2c-algo-pca.c b/drivers/i2c/algos/i2c-algo-pca.c
index 36fdf971f080..2a16211f12e5 100644
--- a/drivers/i2c/algos/i2c-algo-pca.c
+++ b/drivers/i2c/algos/i2c-algo-pca.c
@@ -350,7 +350,7 @@ static int pca_init(struct i2c_algo_pca_data *adap)
350 pca_outw(adap, I2C_PCA_ADR, own << 1); 350 pca_outw(adap, I2C_PCA_ADR, own << 1);
351 351
352 pca_set_con(adap, I2C_PCA_CON_ENSIO | clock); 352 pca_set_con(adap, I2C_PCA_CON_ENSIO | clock);
353 udelay(500); /* 500 s for oscilator to stabilise */ 353 udelay(500); /* 500 s for oscilator to stabilise */
354 354
355 return 0; 355 return 0;
356} 356}
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c
index ecb2c2d7d540..ab2e6f3498b4 100644
--- a/drivers/i2c/algos/i2c-algo-pcf.c
+++ b/drivers/i2c/algos/i2c-algo-pcf.c
@@ -19,7 +19,7 @@
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
20/* ------------------------------------------------------------------------- */ 20/* ------------------------------------------------------------------------- */
21 21
22/* With some changes from Kysti Mlkki <kmalkki@cc.hut.fi> and 22/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
23 Frodo Looijaard <frodol@dds.nl> ,and also from Martin Bailey 23 Frodo Looijaard <frodol@dds.nl> ,and also from Martin Bailey
24 <mbailey@littlefeet-inc.com> */ 24 <mbailey@littlefeet-inc.com> */
25 25
diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c
index 804f0a551c05..b7a9977b025f 100644
--- a/drivers/i2c/busses/i2c-elektor.c
+++ b/drivers/i2c/busses/i2c-elektor.c
@@ -19,7 +19,7 @@
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
20/* ------------------------------------------------------------------------- */ 20/* ------------------------------------------------------------------------- */
21 21
22/* With some changes from Kysti Mlkki <kmalkki@cc.hut.fi> and even 22/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and even
23 Frodo Looijaard <frodol@dds.nl> */ 23 Frodo Looijaard <frodol@dds.nl> */
24 24
25/* Partialy rewriten by Oleg I. Vdovikin for mmapped support of 25/* Partialy rewriten by Oleg I. Vdovikin for mmapped support of
diff --git a/drivers/i2c/busses/i2c-hydra.c b/drivers/i2c/busses/i2c-hydra.c
index 9832f773651d..f9972f9651e4 100644
--- a/drivers/i2c/busses/i2c-hydra.c
+++ b/drivers/i2c/busses/i2c-hydra.c
@@ -7,7 +7,7 @@
7 Copyright (c) 1999-2004 Geert Uytterhoeven <geert@linux-m68k.org> 7 Copyright (c) 1999-2004 Geert Uytterhoeven <geert@linux-m68k.org>
8 8
9 Based on i2c Support for Via Technologies 82C586B South Bridge 9 Based on i2c Support for Via Technologies 82C586B South Bridge
10 Copyright (c) 1998, 1999 Kysti Mlkki <kmalkki@cc.hut.fi> 10 Copyright (c) 1998, 1999 Kyösti Mälkki <kmalkki@cc.hut.fi>
11 11
12 This program is free software; you can redistribute it and/or modify 12 This program is free software; you can redistribute it and/or modify
13 it under the terms of the GNU General Public License as published by 13 it under the terms of the GNU General Public License as published by
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index e08bacadd6bc..9b43ff7270d0 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -18,7 +18,7 @@
18 * Copyright 1995-97 Simon G. Vogl 18 * Copyright 1995-97 Simon G. Vogl
19 * 1998-99 Hans Berglund 19 * 1998-99 Hans Berglund
20 * 20 *
21 * With some changes from Kysti Mlkki <kmalkki@cc.hut.fi> 21 * With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>
22 * and even Frodo Looijaard <frodol@dds.nl> 22 * and even Frodo Looijaard <frodol@dds.nl>
23 * 23 *
24 * This program is free software; you can redistribute it and/or modify it 24 * This program is free software; you can redistribute it and/or modify it
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index e471e3bfdc1e..89a30028ddb6 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -8,7 +8,7 @@
8 * Tony Lindgren <tony@atomide.com> and Imre Deak <imre.deak@nokia.com> 8 * Tony Lindgren <tony@atomide.com> and Imre Deak <imre.deak@nokia.com>
9 * Copyright (C) 2005 Nokia Corporation 9 * Copyright (C) 2005 Nokia Corporation
10 * 10 *
11 * Cleaned up by Juha Yrjl <juha.yrjola@nokia.com> 11 * Cleaned up by Juha Yrjölä <juha.yrjola@nokia.com>
12 * 12 *
13 * This program is free software; you can redistribute it and/or modify 13 * This program is free software; you can redistribute it and/or modify
14 * it under the terms of the GNU General Public License as published by 14 * it under the terms of the GNU General Public License as published by
diff --git a/drivers/i2c/busses/i2c-parport-light.c b/drivers/i2c/busses/i2c-parport-light.c
index 49a95e2887bc..c6faf9bdad18 100644
--- a/drivers/i2c/busses/i2c-parport-light.c
+++ b/drivers/i2c/busses/i2c-parport-light.c
@@ -7,7 +7,7 @@
7 Copyright (C) 1995-2000 Simon G. Vogl 7 Copyright (C) 1995-2000 Simon G. Vogl
8 With some changes from: 8 With some changes from:
9 Frodo Looijaard <frodol@dds.nl> 9 Frodo Looijaard <frodol@dds.nl>
10 Kysti Mlkki <kmalkki@cc.hut.fi> 10 Kyösti Mälkki <kmalkki@cc.hut.fi>
11 11
12 This program is free software; you can redistribute it and/or modify 12 This program is free software; you can redistribute it and/or modify
13 it under the terms of the GNU General Public License as published by 13 it under the terms of the GNU General Public License as published by
diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c
index 039a07fde908..59ba2086d2f9 100644
--- a/drivers/i2c/busses/i2c-parport.c
+++ b/drivers/i2c/busses/i2c-parport.c
@@ -7,7 +7,7 @@
7 Copyright (C) 1995-2000 Simon G. Vogl 7 Copyright (C) 1995-2000 Simon G. Vogl
8 With some changes from: 8 With some changes from:
9 Frodo Looijaard <frodol@dds.nl> 9 Frodo Looijaard <frodol@dds.nl>
10 Kysti Mlkki <kmalkki@cc.hut.fi> 10 Kyösti Mälkki <kmalkki@cc.hut.fi>
11 11
12 This program is free software; you can redistribute it and/or modify 12 This program is free software; you can redistribute it and/or modify
13 it under the terms of the GNU General Public License as published by 13 it under the terms of the GNU General Public License as published by
diff --git a/drivers/i2c/busses/i2c-via.c b/drivers/i2c/busses/i2c-via.c
index 81520868797b..61716f6b14dc 100644
--- a/drivers/i2c/busses/i2c-via.c
+++ b/drivers/i2c/busses/i2c-via.c
@@ -4,7 +4,7 @@
4 4
5 i2c Support for Via Technologies 82C586B South Bridge 5 i2c Support for Via Technologies 82C586B South Bridge
6 6
7 Copyright (c) 1998, 1999 Kysti Mlkki <kmalkki@cc.hut.fi> 7 Copyright (c) 1998, 1999 Kyösti Mälkki <kmalkki@cc.hut.fi>
8 8
9 This program is free software; you can redistribute it and/or modify 9 This program is free software; you can redistribute it and/or modify
10 it under the terms of the GNU General Public License as published by 10 it under the terms of the GNU General Public License as published by
@@ -176,7 +176,7 @@ static void __exit i2c_vt586b_exit(void)
176} 176}
177 177
178 178
179MODULE_AUTHOR("Kysti Mlkki <kmalkki@cc.hut.fi>"); 179MODULE_AUTHOR("Kyösti Mälkki <kmalkki@cc.hut.fi>");
180MODULE_DESCRIPTION("i2c for Via vt82c586b southbridge"); 180MODULE_DESCRIPTION("i2c for Via vt82c586b southbridge");
181MODULE_LICENSE("GPL"); 181MODULE_LICENSE("GPL");
182 182
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index edc275002f80..c9ce77f13c0e 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -2,7 +2,7 @@
2 i2c-viapro.c - Part of lm_sensors, Linux kernel modules for hardware 2 i2c-viapro.c - Part of lm_sensors, Linux kernel modules for hardware
3 monitoring 3 monitoring
4 Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>, 4 Copyright (c) 1998 - 2002 Frodo Looijaard <frodol@dds.nl>,
5 Philip Edelbrock <phil@netroedge.com>, Kysti Mlkki <kmalkki@cc.hut.fi>, 5 Philip Edelbrock <phil@netroedge.com>, Kyösti Mälkki <kmalkki@cc.hut.fi>,
6 Mark D. Studebaker <mdsxyz123@yahoo.com> 6 Mark D. Studebaker <mdsxyz123@yahoo.com>
7 Copyright (C) 2005 - 2007 Jean Delvare <khali@linux-fr.org> 7 Copyright (C) 2005 - 2007 Jean Delvare <khali@linux-fr.org>
8 8
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index e73d58c43f38..1a4e8dc03b36 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -17,7 +17,7 @@
17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ 17 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
18/* ------------------------------------------------------------------------- */ 18/* ------------------------------------------------------------------------- */
19 19
20/* With some changes from Kysti Mlkki <kmalkki@cc.hut.fi>. 20/* With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi>.
21 All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl> 21 All SMBus-related things are written by Frodo Looijaard <frodol@dds.nl>
22 SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com> and 22 SMBus 2.0 support by Mark Studebaker <mdsxyz123@yahoo.com> and
23 Jean Delvare <khali@linux-fr.org> */ 23 Jean Delvare <khali@linux-fr.org> */
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
index ca843522f91d..57a5f63d6ae3 100644
--- a/drivers/ide/ide-cd.c
+++ b/drivers/ide/ide-cd.c
@@ -120,7 +120,7 @@
120 * Reformat to match kernel tabbing style. 120 * Reformat to match kernel tabbing style.
121 * Add CDROM_GET_UPC ioctl. 121 * Add CDROM_GET_UPC ioctl.
122 * 3.10 Apr 10, 1996 -- Fix compilation error with STANDARD_ATAPI. 122 * 3.10 Apr 10, 1996 -- Fix compilation error with STANDARD_ATAPI.
123 * 3.11 Apr 29, 1996 -- Patch from Heiko Eissfeldt <heiko@colossus.escape.de> 123 * 3.11 Apr 29, 1996 -- Patch from Heiko Eißfeldt <heiko@colossus.escape.de>
124 * to remove redundant verify_area calls. 124 * to remove redundant verify_area calls.
125 * 3.12 May 7, 1996 -- Rudimentary changer support. Based on patches 125 * 3.12 May 7, 1996 -- Rudimentary changer support. Based on patches
126 * from Gerhard Zuber <zuber@berlin.snafu.de>. 126 * from Gerhard Zuber <zuber@berlin.snafu.de>.
@@ -256,7 +256,7 @@
256 * - Minimize the TOC reading - only do it when we 256 * - Minimize the TOC reading - only do it when we
257 * know a media change has occurred. 257 * know a media change has occurred.
258 * - Moved all the CDROMREADx ioctls to the Uniform layer. 258 * - Moved all the CDROMREADx ioctls to the Uniform layer.
259 * - Heiko Eissfeldt <heiko@colossus.escape.de> supplied 259 * - Heiko Eißfeldt <heiko@colossus.escape.de> supplied
260 * some fixes for CDI. 260 * some fixes for CDI.
261 * - CD-ROM leaving door locked fix from Andries 261 * - CD-ROM leaving door locked fix from Andries
262 * Brouwer <Andries.Brouwer@cwi.nl> 262 * Brouwer <Andries.Brouwer@cwi.nl>
@@ -2341,7 +2341,7 @@ static int cdrom_read_toc(ide_drive_t *drive, struct request_sense *sense)
2341 If we get an error for the regular case, we assume 2341 If we get an error for the regular case, we assume
2342 a CDI without additional audio tracks. In this case 2342 a CDI without additional audio tracks. In this case
2343 the readable TOC is empty (CDI tracks are not included) 2343 the readable TOC is empty (CDI tracks are not included)
2344 and only holds the Leadout entry. Heiko Eifeldt */ 2344 and only holds the Leadout entry. Heiko Eißfeldt */
2345 ntracks = 0; 2345 ntracks = 0;
2346 stat = cdrom_read_tocentry(drive, CDROM_LEADOUT, 1, 0, 2346 stat = cdrom_read_tocentry(drive, CDROM_LEADOUT, 1, 0,
2347 (char *)&toc->hdr, 2347 (char *)&toc->hdr,
diff --git a/drivers/ide/legacy/q40ide.c b/drivers/ide/legacy/q40ide.c
index e628a983ce33..16ba70b46096 100644
--- a/drivers/ide/legacy/q40ide.c
+++ b/drivers/ide/legacy/q40ide.c
@@ -102,7 +102,7 @@ void q40_ide_setup_ports ( hw_regs_t *hw,
102 102
103/* 103/*
104 * the static array is needed to have the name reported in /proc/ioports, 104 * the static array is needed to have the name reported in /proc/ioports,
105 * hwif->name unfortunately isnt available yet 105 * hwif->name unfortunately isn't available yet
106 */ 106 */
107static const char *q40_ide_names[Q40IDE_NUM_HWIFS]={ 107static const char *q40_ide_names[Q40IDE_NUM_HWIFS]={
108 "ide0", "ide1" 108 "ide0", "ide1"
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index 27fc475bd3a1..a6ca9d5e252f 100644
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -4,7 +4,7 @@
4 * Copyright (c) 1999-2001 Vojtech Pavlik 4 * Copyright (c) 1999-2001 Vojtech Pavlik
5 * 5 *
6 * Based on the work of: 6 * Based on the work of:
7 * Andree Borrmann Mats Sjvall 7 * Andree Borrmann Mats Sjövall
8 */ 8 */
9 9
10/* 10/*
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index 76f1969552c5..babc913d5492 100644
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -4,7 +4,7 @@
4 * OMAP Keypad Driver 4 * OMAP Keypad Driver
5 * 5 *
6 * Copyright (C) 2003 Nokia Corporation 6 * Copyright (C) 2003 Nokia Corporation
7 * Written by Timo Ters <ext-timo.teras@nokia.com> 7 * Written by Timo Teräs <ext-timo.teras@nokia.com>
8 * 8 *
9 * Added support for H2 & H3 Keypad 9 * Added support for H2 & H3 Keypad
10 * Copyright (C) 2004 Texas Instruments 10 * Copyright (C) 2004 Texas Instruments
@@ -481,6 +481,6 @@ static void __exit omap_kp_exit(void)
481module_init(omap_kp_init); 481module_init(omap_kp_init);
482module_exit(omap_kp_exit); 482module_exit(omap_kp_exit);
483 483
484MODULE_AUTHOR("Timo Ters"); 484MODULE_AUTHOR("Timo Teräs");
485MODULE_DESCRIPTION("OMAP Keypad Driver"); 485MODULE_DESCRIPTION("OMAP Keypad Driver");
486MODULE_LICENSE("GPL"); 486MODULE_LICENSE("GPL");
diff --git a/drivers/isdn/hisax/amd7930_fn.c b/drivers/isdn/hisax/amd7930_fn.c
index 3b19caeba258..c0d7036404a5 100644
--- a/drivers/isdn/hisax/amd7930_fn.c
+++ b/drivers/isdn/hisax/amd7930_fn.c
@@ -767,7 +767,7 @@ Amd7930_init(struct IsdnCardState *cs)
767 /* read */ 767 /* read */
768 if (*ptr++ >= 0x100) { 768 if (*ptr++ >= 0x100) {
769 if (cmd < 8) 769 if (cmd < 8)
770 /* setzt Register zurck */ 770 /* reset register */
771 rByteAMD(cs, cmd); 771 rByteAMD(cs, cmd);
772 else { 772 else {
773 wByteAMD(cs, 0x00, cmd); 773 wByteAMD(cs, 0x00, cmd);
diff --git a/drivers/isdn/hisax/enternow_pci.c b/drivers/isdn/hisax/enternow_pci.c
index b73027ff50e8..39f421ed8de8 100644
--- a/drivers/isdn/hisax/enternow_pci.c
+++ b/drivers/isdn/hisax/enternow_pci.c
@@ -75,16 +75,16 @@
75static const char *enternow_pci_rev = "$Revision: 1.1.4.5 $"; 75static const char *enternow_pci_rev = "$Revision: 1.1.4.5 $";
76 76
77 77
78/* fr PowerISDN PCI */ 78/* for PowerISDN PCI */
79#define TJ_AMD_IRQ 0x20 79#define TJ_AMD_IRQ 0x20
80#define TJ_LED1 0x40 80#define TJ_LED1 0x40
81#define TJ_LED2 0x80 81#define TJ_LED2 0x80
82 82
83 83
84/* Das Fenster zum AMD... 84/* The window to [the] AMD [chip]...
85 * Ab Adresse hw.njet.base + TJ_AMD_PORT werden vom AMD jeweils 8 Bit in 85 * From address hw.njet.base + TJ_AMD_PORT onwards, the AMD
86 * den TigerJet i/o-Raum gemappt 86 * maps [consecutive/multiple] 8 bits into the TigerJet I/O space
87 * -> 0x01 des AMD bei hw.njet.base + 0C4 */ 87 * -> 0x01 of the AMD at hw.njet.base + 0C4 */
88#define TJ_AMD_PORT 0xC0 88#define TJ_AMD_PORT 0xC0
89 89
90 90
@@ -96,11 +96,11 @@ static const char *enternow_pci_rev = "$Revision: 1.1.4.5 $";
96static unsigned char 96static unsigned char
97ReadByteAmd7930(struct IsdnCardState *cs, unsigned char offset) 97ReadByteAmd7930(struct IsdnCardState *cs, unsigned char offset)
98{ 98{
99 /* direktes Register */ 99 /* direct register */
100 if(offset < 8) 100 if(offset < 8)
101 return (inb(cs->hw.njet.isac + 4*offset)); 101 return (inb(cs->hw.njet.isac + 4*offset));
102 102
103 /* indirektes Register */ 103 /* indirect register */
104 else { 104 else {
105 outb(offset, cs->hw.njet.isac + 4*AMD_CR); 105 outb(offset, cs->hw.njet.isac + 4*AMD_CR);
106 return(inb(cs->hw.njet.isac + 4*AMD_DR)); 106 return(inb(cs->hw.njet.isac + 4*AMD_DR));
@@ -111,11 +111,11 @@ ReadByteAmd7930(struct IsdnCardState *cs, unsigned char offset)
111static void 111static void
112WriteByteAmd7930(struct IsdnCardState *cs, unsigned char offset, unsigned char value) 112WriteByteAmd7930(struct IsdnCardState *cs, unsigned char offset, unsigned char value)
113{ 113{
114 /* direktes Register */ 114 /* direct register */
115 if(offset < 8) 115 if(offset < 8)
116 outb(value, cs->hw.njet.isac + 4*offset); 116 outb(value, cs->hw.njet.isac + 4*offset);
117 117
118 /* indirektes Register */ 118 /* indirect register */
119 else { 119 else {
120 outb(offset, cs->hw.njet.isac + 4*AMD_CR); 120 outb(offset, cs->hw.njet.isac + 4*AMD_CR);
121 outb(value, cs->hw.njet.isac + 4*AMD_DR); 121 outb(value, cs->hw.njet.isac + 4*AMD_DR);
diff --git a/drivers/isdn/hisax/hfc_pci.c b/drivers/isdn/hisax/hfc_pci.c
index 077080aca799..fba8b624ffcf 100644
--- a/drivers/isdn/hisax/hfc_pci.c
+++ b/drivers/isdn/hisax/hfc_pci.c
@@ -1,6 +1,6 @@
1/* $Id: hfc_pci.c,v 1.48.2.4 2004/02/11 13:21:33 keil Exp $ 1/* $Id: hfc_pci.c,v 1.48.2.4 2004/02/11 13:21:33 keil Exp $
2 * 2 *
3 * low level driver for CCDs hfc-pci based cards 3 * low level driver for CCD's hfc-pci based cards
4 * 4 *
5 * Author Werner Cornelius 5 * Author Werner Cornelius
6 * based on existing driver for CCD hfc ISA cards 6 * based on existing driver for CCD hfc ISA cards
diff --git a/drivers/isdn/hisax/isdnhdlc.c b/drivers/isdn/hisax/isdnhdlc.c
index 268dced6c34a..c69a77a80062 100644
--- a/drivers/isdn/hisax/isdnhdlc.c
+++ b/drivers/isdn/hisax/isdnhdlc.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * isdnhdlc.c -- General purpose ISDN HDLC decoder. 2 * isdnhdlc.c -- General purpose ISDN HDLC decoder.
3 * 3 *
4 *Copyright (C) 2002 Wolfgang Mes <wolfgang@iksw-muees.de> 4 *Copyright (C) 2002 Wolfgang Mües <wolfgang@iksw-muees.de>
5 * 2001 Frode Isaksen <fisaksen@bewan.com> 5 * 2001 Frode Isaksen <fisaksen@bewan.com>
6 * 2001 Kai Germaschewski <kai.germaschewski@gmx.de> 6 * 2001 Kai Germaschewski <kai.germaschewski@gmx.de>
7 * 7 *
@@ -27,7 +27,7 @@
27 27
28/*-------------------------------------------------------------------*/ 28/*-------------------------------------------------------------------*/
29 29
30MODULE_AUTHOR("Wolfgang Mes <wolfgang@iksw-muees.de>, " 30MODULE_AUTHOR("Wolfgang Mües <wolfgang@iksw-muees.de>, "
31 "Frode Isaksen <fisaksen@bewan.com>, " 31 "Frode Isaksen <fisaksen@bewan.com>, "
32 "Kai Germaschewski <kai.germaschewski@gmx.de>"); 32 "Kai Germaschewski <kai.germaschewski@gmx.de>");
33MODULE_DESCRIPTION("General purpose ISDN HDLC decoder"); 33MODULE_DESCRIPTION("General purpose ISDN HDLC decoder");
diff --git a/drivers/isdn/hisax/isdnhdlc.h b/drivers/isdn/hisax/isdnhdlc.h
index 45167d2f8fb0..cf0a95a24015 100644
--- a/drivers/isdn/hisax/isdnhdlc.h
+++ b/drivers/isdn/hisax/isdnhdlc.h
@@ -5,7 +5,7 @@
5 * Neccessary because some ISDN devices don't have HDLC 5 * Neccessary because some ISDN devices don't have HDLC
6 * controllers. Also included: a bit reversal table. 6 * controllers. Also included: a bit reversal table.
7 * 7 *
8 *Copyright (C) 2002 Wolfgang Mes <wolfgang@iksw-muees.de> 8 *Copyright (C) 2002 Wolfgang Mües <wolfgang@iksw-muees.de>
9 * 2001 Frode Isaksen <fisaksen@bewan.com> 9 * 2001 Frode Isaksen <fisaksen@bewan.com>
10 * 2001 Kai Germaschewski <kai.germaschewski@gmx.de> 10 * 2001 Kai Germaschewski <kai.germaschewski@gmx.de>
11 * 11 *
diff --git a/drivers/isdn/hisax/jade.c b/drivers/isdn/hisax/jade.c
index 43d61d1bc5b6..70840a710acf 100644
--- a/drivers/isdn/hisax/jade.c
+++ b/drivers/isdn/hisax/jade.c
@@ -304,7 +304,7 @@ initjade(struct IsdnCardState *cs)
304 cs->BC_Write_Reg(cs, 1, jade_HDLC_IMR, 0x00); 304 cs->BC_Write_Reg(cs, 1, jade_HDLC_IMR, 0x00);
305 /* Setup host access to hdlc controller */ 305 /* Setup host access to hdlc controller */
306 jade_write_indirect(cs, jade_HDLCCNTRACCESS, (jadeINDIRECT_HAH1|jadeINDIRECT_HAH2)); 306 jade_write_indirect(cs, jade_HDLCCNTRACCESS, (jadeINDIRECT_HAH1|jadeINDIRECT_HAH2));
307 /* Unmask HDLC int (dont forget DSP int later on)*/ 307 /* Unmask HDLC int (don't forget DSP int later on)*/
308 cs->BC_Write_Reg(cs, -1,jade_INT, (jadeINT_HDLC1|jadeINT_HDLC2)); 308 cs->BC_Write_Reg(cs, -1,jade_INT, (jadeINT_HDLC1|jadeINT_HDLC2));
309 309
310 /* once again TRANSPARENT */ 310 /* once again TRANSPARENT */
diff --git a/drivers/isdn/pcbit/capi.c b/drivers/isdn/pcbit/capi.c
index 7b55e151f1b0..ac5a91ccde81 100644
--- a/drivers/isdn/pcbit/capi.c
+++ b/drivers/isdn/pcbit/capi.c
@@ -15,9 +15,9 @@
15 15
16/* 16/*
17 * Documentation: 17 * Documentation:
18 * - "Common ISDN API - Perfil Portugus - Verso 2.1", 18 * - "Common ISDN API - Perfil Português - Versão 2.1",
19 * Telecom Portugal, Fev 1992. 19 * Telecom Portugal, Fev 1992.
20 * - "Common ISDN API - Especificao de protocolos para 20 * - "Common ISDN API - Especificação de protocolos para
21 * acesso aos canais B", Inesc, Jan 1994. 21 * acesso aos canais B", Inesc, Jan 1994.
22 */ 22 */
23 23
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 16775a0df7f6..85478d6a9c1a 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -9,7 +9,7 @@
9 * 9 *
10 * Better read-balancing code written by Mika Kuoppala <miku@iki.fi>, 2000 10 * Better read-balancing code written by Mika Kuoppala <miku@iki.fi>, 2000
11 * 11 *
12 * Fixes to reconstruction by Jakob stergaard" <jakob@ostenfeld.dk> 12 * Fixes to reconstruction by Jakob Østergaard" <jakob@ostenfeld.dk>
13 * Various fixes by Neil Brown <neilb@cse.unsw.edu.au> 13 * Various fixes by Neil Brown <neilb@cse.unsw.edu.au>
14 * 14 *
15 * Changes by Peter T. Breuer <ptb@it.uc3m.es> 31/1/2003 to support 15 * Changes by Peter T. Breuer <ptb@it.uc3m.es> 31/1/2003 to support
diff --git a/drivers/media/common/saa7146_hlp.c b/drivers/media/common/saa7146_hlp.c
index d2905720eb74..9c905399a233 100644
--- a/drivers/media/common/saa7146_hlp.c
+++ b/drivers/media/common/saa7146_hlp.c
@@ -312,7 +312,7 @@ static int sort_and_eliminate(u32* values, int* count)
312 return -EINVAL; 312 return -EINVAL;
313 } 313 }
314 314
315 /* bubble sort the first count items of the array values */ 315 /* bubble sort the first @count items of the array @values */
316 for( top = *count; top > 0; top--) { 316 for( top = *count; top > 0; top--) {
317 for( low = 0, high = 1; high < top; low++, high++) { 317 for( low = 0, high = 1; high < top; low++, high++) {
318 if( values[low] > values[high] ) { 318 if( values[low] > values[high] ) {
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c
index 154a7ce7cb82..a05e5c182288 100644
--- a/drivers/media/dvb/cinergyT2/cinergyT2.c
+++ b/drivers/media/dvb/cinergyT2/cinergyT2.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * TerraTec Cinergy T/qanu USB2 DVB-T adapter. 2 * TerraTec Cinergy T/qanu USB2 DVB-T adapter.
3 * 3 *
4 * Copyright (C) 2004 Daniel Mack <daniel@qanu.de> and 4 * Copyright (C) 2004 Daniel Mack <daniel@qanu.de> and
5 * Holger Waechtler <holger@qanu.de> 5 * Holger Waechtler <holger@qanu.de>
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 3162223a2ff5..3abd9fa54d2c 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -1259,7 +1259,7 @@ struct tvcard bttv_tvcards[] = {
1259 .has_radio = 1, 1259 .has_radio = 1,
1260 }, 1260 },
1261 [BTTV_BOARD_LIFETEC_9415] = { 1261 [BTTV_BOARD_LIFETEC_9415] = {
1262 /* Tim Rstermundt <rosterm@uni-muenster.de> 1262 /* Tim Röstermundt <rosterm@uni-muenster.de>
1263 in de.comp.os.unix.linux.hardware: 1263 in de.comp.os.unix.linux.hardware:
1264 options bttv card=0 pll=1 radio=1 gpiomask=0x18e0 1264 options bttv card=0 pll=1 radio=1 gpiomask=0x18e0
1265 gpiomux =0x44c71f,0x44d71f,0,0x44d71f,0x44dfff 1265 gpiomux =0x44c71f,0x44d71f,0,0x44d71f,0x44dfff
@@ -2824,7 +2824,7 @@ struct tvcard bttv_tvcards[] = {
2824 }, 2824 },
2825 /* ---- card 0x8b ---------------------------------- */ 2825 /* ---- card 0x8b ---------------------------------- */
2826 [BTTV_BOARD_PV_M4900] = { 2826 [BTTV_BOARD_PV_M4900] = {
2827 /* Srgio Fortier <sergiofortier@yahoo.com.br> */ 2827 /* Sérgio Fortier <sergiofortier@yahoo.com.br> */
2828 .name = "Prolink PixelView PlayTV MPEG2 PV-M4900", 2828 .name = "Prolink PixelView PlayTV MPEG2 PV-M4900",
2829 .video_inputs = 3, 2829 .video_inputs = 3,
2830 .audio_inputs = 1, 2830 .audio_inputs = 1,
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 7533fc203319..69283926a8dc 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net> 4 * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net>
5 * 5 *
6 * Copyright (C) 2001-2002 Alcve <www.alcove.com> 6 * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
7 * 7 *
8 * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com> 8 * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com>
9 * 9 *
diff --git a/drivers/media/video/meye.h b/drivers/media/video/meye.h
index 323d0074120d..d535748df445 100644
--- a/drivers/media/video/meye.h
+++ b/drivers/media/video/meye.h
@@ -3,7 +3,7 @@
3 * 3 *
4 * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net> 4 * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net>
5 * 5 *
6 * Copyright (C) 2001-2002 Alcve <www.alcove.com> 6 * Copyright (C) 2001-2002 Alcôve <www.alcove.com>
7 * 7 *
8 * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com> 8 * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com>
9 * 9 *
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c
index ff555129c82f..db3c9e3deb26 100644
--- a/drivers/media/video/usbvideo/vicam.c
+++ b/drivers/media/video/usbvideo/vicam.c
@@ -955,7 +955,7 @@ read_frame(struct vicam_camera *cam, int framenum)
955 request[7] = realShutter >> 8; 955 request[7] = realShutter >> 8;
956 } 956 }
957 957
958 // Per John Markus Bjrndalen, byte at index 8 causes problems if it isn't 0 958 // Per John Markus Bjørndalen, byte at index 8 causes problems if it isn't 0
959 request[8] = 0; 959 request[8] = 0;
960 // bytes 9-15 do not seem to affect exposure or image quality 960 // bytes 9-15 do not seem to affect exposure or image quality
961 961
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c
index c3440b280d20..321249240d05 100644
--- a/drivers/media/video/v4l2-common.c
+++ b/drivers/media/video/v4l2-common.c
@@ -37,7 +37,7 @@
37 * Video4linux 1/2 integration by Justin Schoeman 37 * Video4linux 1/2 integration by Justin Schoeman
38 * <justin@suntiger.ee.up.ac.za> 38 * <justin@suntiger.ee.up.ac.za>
39 * 2.4 PROCFS support ported from 2.4 kernels by 39 * 2.4 PROCFS support ported from 2.4 kernels by
40 * Iaki Garca Etxebarria <garetxe@euskalnet.net> 40 * Iñaki García Etxebarria <garetxe@euskalnet.net>
41 * Makefile fix by "W. Michael Petullo" <mike@flyn.org> 41 * Makefile fix by "W. Michael Petullo" <mike@flyn.org>
42 * 2.4 devfs support ported from 2.4 kernels by 42 * 2.4 devfs support ported from 2.4 kernels by
43 * Dan Merillat <dan@merillat.org> 43 * Dan Merillat <dan@merillat.org>
diff --git a/drivers/message/i2o/README b/drivers/message/i2o/README
index a81f851f7b5d..911fc3021e3b 100644
--- a/drivers/message/i2o/README
+++ b/drivers/message/i2o/README
@@ -30,13 +30,13 @@ Juha Sievanen, University of Helsinki Finland
30 Bug fixes 30 Bug fixes
31 Core code extensions 31 Core code extensions
32 32
33Auvo Hkkinen, University of Helsinki Finland 33Auvo Häkkinen, University of Helsinki Finland
34 LAN OSM code 34 LAN OSM code
35 /Proc interface to LAN class 35 /Proc interface to LAN class
36 Bug fixes 36 Bug fixes
37 Core code extensions 37 Core code extensions
38 38
39Taneli Vhkangas, University of Helsinki Finland 39Taneli Vähäkangas, University of Helsinki Finland
40 Fixes to i2o_config 40 Fixes to i2o_config
41 41
42CREDITS 42CREDITS
diff --git a/drivers/message/i2o/exec-osm.c b/drivers/message/i2o/exec-osm.c
index ce8f1a34ed21..6cbcc21de518 100644
--- a/drivers/message/i2o/exec-osm.c
+++ b/drivers/message/i2o/exec-osm.c
@@ -15,8 +15,8 @@
15 * 15 *
16 * Fixes/additions: 16 * Fixes/additions:
17 * Philipp Rumpf 17 * Philipp Rumpf
18 * Juha Sievnen <Juha.Sievanen@cs.Helsinki.FI> 18 * Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI>
19 * Auvo Hkkinen <Auvo.Hakkinen@cs.Helsinki.FI> 19 * Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI>
20 * Deepak Saxena <deepak@plexity.net> 20 * Deepak Saxena <deepak@plexity.net>
21 * Boji T Kannanthanam <boji.t.kannanthanam@intel.com> 21 * Boji T Kannanthanam <boji.t.kannanthanam@intel.com>
22 * Alan Cox <alan@redhat.com>: 22 * Alan Cox <alan@redhat.com>:
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index 84e046e94f5f..c0fb77dc19bb 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -10,12 +10,12 @@
10 * Added basic ioctl() support 10 * Added basic ioctl() support
11 * Deepak Saxena (06/07/1999): 11 * Deepak Saxena (06/07/1999):
12 * Added software download ioctl (still testing) 12 * Added software download ioctl (still testing)
13 * Auvo Hkkinen (09/10/1999): 13 * Auvo Häkkinen (09/10/1999):
14 * Changes to i2o_cfg_reply(), ioctl_parms() 14 * Changes to i2o_cfg_reply(), ioctl_parms()
15 * Added ioct_validate() 15 * Added ioct_validate()
16 * Taneli Vhkangas (09/30/1999): 16 * Taneli Vähäkangas (09/30/1999):
17 * Fixed ioctl_swdl() 17 * Fixed ioctl_swdl()
18 * Taneli Vhkangas (10/04/1999): 18 * Taneli Vähäkangas (10/04/1999):
19 * Changed ioctl_swdl(), implemented ioctl_swul() and ioctl_swdel() 19 * Changed ioctl_swdl(), implemented ioctl_swul() and ioctl_swdel()
20 * Deepak Saxena (11/18/1999): 20 * Deepak Saxena (11/18/1999):
21 * Added event managmenet support 21 * Added event managmenet support
diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c
index 06892ac2286e..6fdd072201f9 100644
--- a/drivers/message/i2o/i2o_proc.c
+++ b/drivers/message/i2o/i2o_proc.c
@@ -19,8 +19,8 @@
19 * 19 *
20 * 20 *
21 * Fixes/additions: 21 * Fixes/additions:
22 * Juha Sievnen (Juha.Sievanen@cs.Helsinki.FI), 22 * Juha Sievänen (Juha.Sievanen@cs.Helsinki.FI),
23 * Auvo Hkkinen (Auvo.Hakkinen@cs.Helsinki.FI) 23 * Auvo Häkkinen (Auvo.Hakkinen@cs.Helsinki.FI)
24 * University of Helsinki, Department of Computer Science 24 * University of Helsinki, Department of Computer Science
25 * LAN entries 25 * LAN entries
26 * Markus Lidel <Markus.Lidel@shadowconnect.com> 26 * Markus Lidel <Markus.Lidel@shadowconnect.com>
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index a1ec16a075c6..7814a06ae970 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -15,8 +15,8 @@
15 * 15 *
16 * Fixes/additions: 16 * Fixes/additions:
17 * Philipp Rumpf 17 * Philipp Rumpf
18 * Juha Sievnen <Juha.Sievanen@cs.Helsinki.FI> 18 * Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI>
19 * Auvo Hkkinen <Auvo.Hakkinen@cs.Helsinki.FI> 19 * Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI>
20 * Deepak Saxena <deepak@plexity.net> 20 * Deepak Saxena <deepak@plexity.net>
21 * Boji T Kannanthanam <boji.t.kannanthanam@intel.com> 21 * Boji T Kannanthanam <boji.t.kannanthanam@intel.com>
22 * Alan Cox <alan@redhat.com>: 22 * Alan Cox <alan@redhat.com>:
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index 3661e6e065d2..685a89547a51 100644
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -15,8 +15,8 @@
15 * 15 *
16 * Fixes/additions: 16 * Fixes/additions:
17 * Philipp Rumpf 17 * Philipp Rumpf
18 * Juha Sievnen <Juha.Sievanen@cs.Helsinki.FI> 18 * Juha Sievänen <Juha.Sievanen@cs.Helsinki.FI>
19 * Auvo Hkkinen <Auvo.Hakkinen@cs.Helsinki.FI> 19 * Auvo Häkkinen <Auvo.Hakkinen@cs.Helsinki.FI>
20 * Deepak Saxena <deepak@plexity.net> 20 * Deepak Saxena <deepak@plexity.net>
21 * Boji T Kannanthanam <boji.t.kannanthanam@intel.com> 21 * Boji T Kannanthanam <boji.t.kannanthanam@intel.com>
22 * Alan Cox <alan@redhat.com>: 22 * Alan Cox <alan@redhat.com>:
diff --git a/drivers/misc/ibmasm/remote.c b/drivers/misc/ibmasm/remote.c
index 1d9defb1a10c..477bb43c899c 100644
--- a/drivers/misc/ibmasm/remote.c
+++ b/drivers/misc/ibmasm/remote.c
@@ -17,7 +17,7 @@
17 * 17 *
18 * Copyright (C) IBM Corporation, 2004 18 * Copyright (C) IBM Corporation, 2004
19 * 19 *
20 * Authors: Max Asbck <amax@us.ibm.com> 20 * Authors: Max Asböck <amax@us.ibm.com>
21 * Vernon Mauery <vernux@us.ibm.com> 21 * Vernon Mauery <vernux@us.ibm.com>
22 * 22 *
23 */ 23 */
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 973b684c11e3..eef6fecfff2a 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -73,7 +73,7 @@
73 73
74 Jean-Jacques Michel - bug fix 74 Jean-Jacques Michel - bug fix
75 75
76 Tobias Ringstrm - Rx interrupt status checking suggestion 76 Tobias Ringström - Rx interrupt status checking suggestion
77 77
78 Andrew Morton - Clear blocked signals, avoid 78 Andrew Morton - Clear blocked signals, avoid
79 buffer overrun setting current->comm. 79 buffer overrun setting current->comm.
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index 3fa3bccd1adb..10f3a196be32 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Amiga Linux/m68k Ariadne Ethernet Driver 2 * Amiga Linux/m68k Ariadne Ethernet Driver
3 * 3 *
4 * Copyright 1995-2003 by Geert Uytterhoeven (geert@linux-m68k.org) 4 * Copyright 1995-2003 by Geert Uytterhoeven (geert@linux-m68k.org)
5 * Peter De Schrijver (p2@mind.be) 5 * Peter De Schrijver (p2@mind.be)
6 * 6 *
7 * --------------------------------------------------------------------------- 7 * ---------------------------------------------------------------------------
diff --git a/drivers/net/ariadne.h b/drivers/net/ariadne.h
index f7913d5a39f1..bb613f292e04 100644
--- a/drivers/net/ariadne.h
+++ b/drivers/net/ariadne.h
@@ -1,7 +1,7 @@
1/* 1/*
2 * Amiga Linux/m68k Ariadne Ethernet Driver 2 * Amiga Linux/m68k Ariadne Ethernet Driver
3 * 3 *
4 * Copyright 1995 by Geert Uytterhoeven (geert@linux-m68k.org) 4 * Copyright 1995 by Geert Uytterhoeven (geert@linux-m68k.org)
5 * Peter De Schrijver 5 * Peter De Schrijver
6 * (Peter.DeSchrijver@linux.cc.kuleuven.ac.be) 6 * (Peter.DeSchrijver@linux.cc.kuleuven.ac.be)
7 * 7 *
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index ad9e327c3b03..e0119f6a3319 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -3,7 +3,7 @@
3 * devices like TTY. It interfaces between a raw TTY and the 3 * devices like TTY. It interfaces between a raw TTY and the
4 * kernel's AX.25 protocol layers. 4 * kernel's AX.25 protocol layers.
5 * 5 *
6 * Authors: Andreas Knsgen <ajk@iehk.rwth-aachen.de> 6 * Authors: Andreas Könsgen <ajk@iehk.rwth-aachen.de>
7 * Ralf Baechle DL5RB <ralf@linux-mips.org> 7 * Ralf Baechle DL5RB <ralf@linux-mips.org>
8 * 8 *
9 * Quite a lot of stuff "stolen" by Joerg Reuter from slip.c, written by 9 * Quite a lot of stuff "stolen" by Joerg Reuter from slip.c, written by
diff --git a/drivers/net/irda/actisys-sir.c b/drivers/net/irda/actisys-sir.c
index ccf6ec548a64..736d2473b7e1 100644
--- a/drivers/net/irda/actisys-sir.c
+++ b/drivers/net/irda/actisys-sir.c
@@ -21,7 +21,7 @@
21 * published by the Free Software Foundation; either version 2 of 21 * published by the Free Software Foundation; either version 2 of
22 * the License, or (at your option) any later version. 22 * the License, or (at your option) any later version.
23 * 23 *
24 * Neither Dag Brattli nor University of Troms admit liability nor 24 * Neither Dag Brattli nor University of Tromsø admit liability nor
25 * provide warranty for any of this software. This material is 25 * provide warranty for any of this software. This material is
26 * provided "AS-IS" and at no charge. 26 * provided "AS-IS" and at no charge.
27 * 27 *
diff --git a/drivers/net/irda/actisys.c b/drivers/net/irda/actisys.c
index b2e31f4a384c..ae0b80a5680c 100644
--- a/drivers/net/irda/actisys.c
+++ b/drivers/net/irda/actisys.c
@@ -19,7 +19,7 @@
19 * published by the Free Software Foundation; either version 2 of 19 * published by the Free Software Foundation; either version 2 of
20 * the License, or (at your option) any later version. 20 * the License, or (at your option) any later version.
21 * 21 *
22 * Neither Dag Brattli nor University of Troms admit liability nor 22 * Neither Dag Brattli nor University of Tromsø admit liability nor
23 * provide warranty for any of this software. This material is 23 * provide warranty for any of this software. This material is
24 * provided "AS-IS" and at no charge. 24 * provided "AS-IS" and at no charge.
25 * 25 *
diff --git a/drivers/net/irda/girbil-sir.c b/drivers/net/irda/girbil-sir.c
index 0d2fe87fb9b7..738531b16bd3 100644
--- a/drivers/net/irda/girbil-sir.c
+++ b/drivers/net/irda/girbil-sir.c
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Troms admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/drivers/net/irda/girbil.c b/drivers/net/irda/girbil.c
index 248aeb0c726c..1f57391a618b 100644
--- a/drivers/net/irda/girbil.c
+++ b/drivers/net/irda/girbil.c
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Troms admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/drivers/net/irda/irport.h b/drivers/net/irda/irport.h
index 3f46b84c6c85..66fc2433e97d 100644
--- a/drivers/net/irda/irport.h
+++ b/drivers/net/irda/irport.h
@@ -17,7 +17,7 @@
17 * published by the Free Software Foundation; either version 2 of 17 * published by the Free Software Foundation; either version 2 of
18 * the License, or (at your option) any later version. 18 * the License, or (at your option) any later version.
19 * 19 *
20 * Neither Dag Brattli nor University of Troms admit liability nor 20 * Neither Dag Brattli nor University of Tromsø admit liability nor
21 * provide warranty for any of this software. This material is 21 * provide warranty for any of this software. This material is
22 * provided "AS-IS" and at no charge. 22 * provided "AS-IS" and at no charge.
23 * 23 *
diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c
index 6f5f697ec9f8..2c6f7be36e8a 100644
--- a/drivers/net/irda/irtty-sir.c
+++ b/drivers/net/irda/irtty-sir.c
@@ -20,7 +20,7 @@
20 * published by the Free Software Foundation; either version 2 of 20 * published by the Free Software Foundation; either version 2 of
21 * the License, or (at your option) any later version. 21 * the License, or (at your option) any later version.
22 * 22 *
23 * Neither Dag Brattli nor University of Troms admit liability nor 23 * Neither Dag Brattli nor University of Tromsø admit liability nor
24 * provide warranty for any of this software. This material is 24 * provide warranty for any of this software. This material is
25 * provided "AS-IS" and at no charge. 25 * provided "AS-IS" and at no charge.
26 * 26 *
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index 12b9378c587f..a873d2b315ca 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -20,7 +20,7 @@
20 * published by the Free Software Foundation; either version 2 of 20 * published by the Free Software Foundation; either version 2 of
21 * the License, or (at your option) any later version. 21 * the License, or (at your option) any later version.
22 * 22 *
23 * Neither Dag Brattli nor University of Troms admit liability nor 23 * Neither Dag Brattli nor University of Tromsø admit liability nor
24 * provide warranty for any of this software. This material is 24 * provide warranty for any of this software. This material is
25 * provided "AS-IS" and at no charge. 25 * provided "AS-IS" and at no charge.
26 * 26 *
diff --git a/drivers/net/irda/nsc-ircc.h b/drivers/net/irda/nsc-ircc.h
index dacf671abcd6..bbdc97ff83ca 100644
--- a/drivers/net/irda/nsc-ircc.h
+++ b/drivers/net/irda/nsc-ircc.h
@@ -19,7 +19,7 @@
19 * published by the Free Software Foundation; either version 2 of 19 * published by the Free Software Foundation; either version 2 of
20 * the License, or (at your option) any later version. 20 * the License, or (at your option) any later version.
21 * 21 *
22 * Neither Dag Brattli nor University of Troms admit liability nor 22 * Neither Dag Brattli nor University of Tromsø admit liability nor
23 * provide warranty for any of this software. This material is 23 * provide warranty for any of this software. This material is
24 * provided "AS-IS" and at no charge. 24 * provided "AS-IS" and at no charge.
25 * 25 *
diff --git a/drivers/net/irda/tekram-sir.c b/drivers/net/irda/tekram-sir.c
index 0dd6bc7af3f2..d1ce5ae6a172 100644
--- a/drivers/net/irda/tekram-sir.c
+++ b/drivers/net/irda/tekram-sir.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Troms admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *
diff --git a/drivers/net/irda/tekram.c b/drivers/net/irda/tekram.c
index 8f6258221cb0..9bfd2441adbf 100644
--- a/drivers/net/irda/tekram.c
+++ b/drivers/net/irda/tekram.c
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Troms admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/drivers/net/irda/w83977af_ir.h b/drivers/net/irda/w83977af_ir.h
index 0b7661deafee..87c3975baf62 100644
--- a/drivers/net/irda/w83977af_ir.h
+++ b/drivers/net/irda/w83977af_ir.h
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Troms admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index c2d71afd57e5..2402cb8dd328 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -4,18 +4,18 @@
4 * Version: 0.4.1 4 * Version: 0.4.1
5 * Description: Netwave AirSurfer Wireless LAN PC Card driver 5 * Description: Netwave AirSurfer Wireless LAN PC Card driver
6 * Status: Experimental. 6 * Status: Experimental.
7 * Authors: John Markus Bjrndalen <johnm@cs.uit.no> 7 * Authors: John Markus Bjørndalen <johnm@cs.uit.no>
8 * Dag Brattli <dagb@cs.uit.no> 8 * Dag Brattli <dagb@cs.uit.no>
9 * David Hinds <dahinds@users.sourceforge.net> 9 * David Hinds <dahinds@users.sourceforge.net>
10 * Created at: A long time ago! 10 * Created at: A long time ago!
11 * Modified at: Mon Nov 10 11:54:37 1997 11 * Modified at: Mon Nov 10 11:54:37 1997
12 * Modified by: Dag Brattli <dagb@cs.uit.no> 12 * Modified by: Dag Brattli <dagb@cs.uit.no>
13 * 13 *
14 * Copyright (c) 1997 University of Troms, Norway 14 * Copyright (c) 1997 University of Tromsø, Norway
15 * 15 *
16 * Revision History: 16 * Revision History:
17 * 17 *
18 * 08-Nov-97 15:14:47 John Markus Bjrndalen <johnm@cs.uit.no> 18 * 08-Nov-97 15:14:47 John Markus Bjørndalen <johnm@cs.uit.no>
19 * - Fixed some bugs in netwave_rx and cleaned it up a bit. 19 * - Fixed some bugs in netwave_rx and cleaned it up a bit.
20 * (One of the bugs would have destroyed packets when receiving 20 * (One of the bugs would have destroyed packets when receiving
21 * multiple packets per interrupt). 21 * multiple packets per interrupt).
@@ -158,7 +158,7 @@ static int pc_debug = PCMCIA_DEBUG;
158module_param(pc_debug, int, 0); 158module_param(pc_debug, int, 0);
159#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) 159#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
160static char *version = 160static char *version =
161"netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bjrndalen)\n"; 161"netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bjørndalen)\n";
162#else 162#else
163#define DEBUG(n, args...) 163#define DEBUG(n, args...)
164#endif 164#endif
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index 69402f3a1453..5b7385e430ea 100644
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -40,7 +40,7 @@ struct DCTL_data {
40 * 40 *
41 * Each bit configuration leading to an action code 2 (Exit with 41 * Each bit configuration leading to an action code 2 (Exit with
42 * programming error or unusual condition indication) 42 * programming error or unusual condition indication)
43 * are handled as fatal errors. 43 * are handled as fatal errors.
44 * 44 *
45 * All other configurations are handled as recoverable errors. 45 * All other configurations are handled as recoverable errors.
46 * 46 *
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index b960f66843e4..725b0dd14269 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -158,7 +158,7 @@ static inline u64 time_to_avg_nsec(u32 value, u32 count)
158 if (count == 0) 158 if (count == 0)
159 return 0; 159 return 0;
160 160
161 /* value comes in units of 128 sec */ 161 /* value comes in units of 128 sec */
162 ret = time_to_nsec(value); 162 ret = time_to_nsec(value);
163 do_div(ret, count); 163 do_div(ret, count);
164 164
diff --git a/drivers/s390/net/ctcmain.c b/drivers/s390/net/ctcmain.c
index 449937233732..6bf3ebbe985a 100644
--- a/drivers/s390/net/ctcmain.c
+++ b/drivers/s390/net/ctcmain.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation 4 * Copyright (C) 2001 IBM Deutschland Entwicklung GmbH, IBM Corporation
5 * Author(s): Fritz Elfert (elfert@de.ibm.com, felfert@millenux.com) 5 * Author(s): Fritz Elfert (elfert@de.ibm.com, felfert@millenux.com)
6 * Fixes by : Jochen Rhrig (roehrig@de.ibm.com) 6 * Fixes by : Jochen Röhrig (roehrig@de.ibm.com)
7 * Arnaldo Carvalho de Melo <acme@conectiva.com.br> 7 * Arnaldo Carvalho de Melo <acme@conectiva.com.br>
8 Peter Tiedemann (ptiedem@de.ibm.com) 8 Peter Tiedemann (ptiedem@de.ibm.com)
9 * Driver Model stuff by : Cornelia Huck <cornelia.huck@de.ibm.com> 9 * Driver Model stuff by : Cornelia Huck <cornelia.huck@de.ibm.com>
@@ -19,7 +19,7 @@
19 * Dieter Wellerdiek (wel@de.ibm.com) 19 * Dieter Wellerdiek (wel@de.ibm.com)
20 * Martin Schwidefsky (schwidefsky@de.ibm.com) 20 * Martin Schwidefsky (schwidefsky@de.ibm.com)
21 * Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com) 21 * Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
22 * Jochen Rhrig (roehrig@de.ibm.com) 22 * Jochen Röhrig (roehrig@de.ibm.com)
23 * 23 *
24 * This program is free software; you can redistribute it and/or modify 24 * This program is free software; you can redistribute it and/or modify
25 * it under the terms of the GNU General Public License as published by 25 * it under the terms of the GNU General Public License as published by
@@ -885,7 +885,7 @@ ch_action_firstio(fsm_instance * fi, int event, void *arg)
885 } 885 }
886 886
887 /** 887 /**
888 * Dont setup a timer for receiving the initial RX frame 888 * Don't setup a timer for receiving the initial RX frame
889 * if in compatibility mode, since VM TCP delays the initial 889 * if in compatibility mode, since VM TCP delays the initial
890 * frame until it has some data to send. 890 * frame until it has some data to send.
891 */ 891 */
@@ -905,10 +905,10 @@ ch_action_firstio(fsm_instance * fi, int event, void *arg)
905 ccw_check_return_code(ch, rc, "init IO"); 905 ccw_check_return_code(ch, rc, "init IO");
906 } 906 }
907 /** 907 /**
908 * If in compatibility mode since we dont setup a timer, we 908 * If in compatibility mode since we don't setup a timer, we
909 * also signal RX channel up immediately. This enables us 909 * also signal RX channel up immediately. This enables us
910 * to send packets early which in turn usually triggers some 910 * to send packets early which in turn usually triggers some
911 * reply from VM TCP which brings up the RX channel to its 911 * reply from VM TCP which brings up the RX channel to it's
912 * final state. 912 * final state.
913 */ 913 */
914 if ((CHANNEL_DIRECTION(ch->flags) == READ) && 914 if ((CHANNEL_DIRECTION(ch->flags) == READ) &&
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c
index f08e71e0205a..a58c265dc8af 100644
--- a/drivers/scsi/aha152x.c
+++ b/drivers/scsi/aha152x.c
@@ -1,6 +1,6 @@
1/* aha152x.c -- Adaptec AHA-152x driver 1/* aha152x.c -- Adaptec AHA-152x driver
2 * Author: Jrgen E. Fischer, fischer@norbit.de 2 * Author: Jürgen E. Fischer, fischer@norbit.de
3 * Copyright 1993-2004 Jrgen E. Fischer 3 * Copyright 1993-2004 Jürgen E. Fischer
4 * 4 *
5 * This program is free software; you can redistribute it and/or modify it 5 * This program is free software; you can redistribute it and/or modify it
6 * under the terms of the GNU General Public License as published by the 6 * under the terms of the GNU General Public License as published by the
@@ -357,7 +357,7 @@ enum {
357 check_condition = 0x0800, /* requesting sense after CHECK CONDITION */ 357 check_condition = 0x0800, /* requesting sense after CHECK CONDITION */
358}; 358};
359 359
360MODULE_AUTHOR("Jrgen Fischer"); 360MODULE_AUTHOR("Jürgen Fischer");
361MODULE_DESCRIPTION(AHA152X_REVID); 361MODULE_DESCRIPTION(AHA152X_REVID);
362MODULE_LICENSE("GPL"); 362MODULE_LICENSE("GPL");
363 363
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c
index dc15a22105f7..4aafe89b557f 100644
--- a/drivers/scsi/sun3_NCR5380.c
+++ b/drivers/scsi/sun3_NCR5380.c
@@ -1596,7 +1596,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd,
1596 * IO while SEL is true. But again, there are some disks out the in the 1596 * IO while SEL is true. But again, there are some disks out the in the
1597 * world that do that nevertheless. (Somebody claimed that this announces 1597 * world that do that nevertheless. (Somebody claimed that this announces
1598 * reselection capability of the target.) So we better skip that test and 1598 * reselection capability of the target.) So we better skip that test and
1599 * only wait for BSY... (Famous german words: Der Klgere gibt nach :-) 1599 * only wait for BSY... (Famous german words: Der Klügere gibt nach :-)
1600 */ 1600 */
1601 1601
1602 while (time_before(jiffies, timeout) && !(NCR5380_read(STATUS_REG) & 1602 while (time_before(jiffies, timeout) && !(NCR5380_read(STATUS_REG) &
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index 3f26c4b2f322..e773c8e14962 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -20,8 +20,8 @@
20 * - S3C2410 and S3C2440 serial support 20 * - S3C2410 and S3C2440 serial support
21 * - Power Management support 21 * - Power Management support
22 * - Fix console via IrDA devices 22 * - Fix console via IrDA devices
23 * - SysReq (Herbert Ptzl) 23 * - SysReq (Herbert Pötzl)
24 * - Break character handling (Herbert Ptzl) 24 * - Break character handling (Herbert Pötzl)
25 * - spin-lock initialisation (Dimitry Andric) 25 * - spin-lock initialisation (Dimitry Andric)
26 * - added clock control 26 * - added clock control
27 * - updated init code to use platform_device info 27 * - updated init code to use platform_device info
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c
index e78c2ddc1f88..367b75c0b25b 100644
--- a/drivers/usb/gadget/lh7a40x_udc.c
+++ b/drivers/usb/gadget/lh7a40x_udc.c
@@ -1272,7 +1272,7 @@ static int lh7a40x_set_halt(struct usb_ep *_ep, int value)
1272 /* 1272 /*
1273 * Attempts to halt IN endpoints will fail (returning -EAGAIN) 1273 * Attempts to halt IN endpoints will fail (returning -EAGAIN)
1274 * if any transfer requests are still queued, or if the controller 1274 * if any transfer requests are still queued, or if the controller
1275 * FIFO still holds bytes that the host hasnt collected. 1275 * FIFO still holds bytes that the host hasn't collected.
1276 */ 1276 */
1277 spin_unlock_irqrestore(&ep->dev->lock, flags); 1277 spin_unlock_irqrestore(&ep->dev->lock, flags);
1278 DEBUG 1278 DEBUG
diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c
index 04e87acd6e46..2677fea147d9 100644
--- a/drivers/usb/misc/cytherm.c
+++ b/drivers/usb/misc/cytherm.c
@@ -118,7 +118,7 @@ static ssize_t set_brightness(struct device *dev, struct device_attribute *attr,
118 cytherm->brightness, buffer, 8); 118 cytherm->brightness, buffer, 8);
119 if (retval) 119 if (retval)
120 dev_dbg(&cytherm->udev->dev, "retval = %d\n", retval); 120 dev_dbg(&cytherm->udev->dev, "retval = %d\n", retval);
121 /* Inform C that we have changed the brightness setting */ 121 /* Inform C that we have changed the brightness setting */
122 retval = vendor_command(cytherm->udev, WRITE_RAM, BRIGHTNESS_SEM, 122 retval = vendor_command(cytherm->udev, WRITE_RAM, BRIGHTNESS_SEM,
123 0x01, buffer, 8); 123 0x01, buffer, 8);
124 if (retval) 124 if (retval)
diff --git a/drivers/usb/misc/emi26.c b/drivers/usb/misc/emi26.c
index 5c0a26cbd128..cd137577bb2d 100644
--- a/drivers/usb/misc/emi26.c
+++ b/drivers/usb/misc/emi26.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Emagic EMI 2|6 usb audio interface firmware loader. 2 * Emagic EMI 2|6 usb audio interface firmware loader.
3 * Copyright (C) 2002 3 * Copyright (C) 2002
4 * Tapio Laxstrm (tapio.laxstrom@iptime.fi) 4 * Tapio Laxström (tapio.laxstrom@iptime.fi)
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License, as published by 7 * it under the terms of the GNU General Public License, as published by
@@ -249,7 +249,7 @@ static void __exit emi26_exit (void)
249module_init(emi26_init); 249module_init(emi26_init);
250module_exit(emi26_exit); 250module_exit(emi26_exit);
251 251
252MODULE_AUTHOR("tapio laxstrm"); 252MODULE_AUTHOR("Tapio Laxström");
253MODULE_DESCRIPTION("Emagic EMI 2|6 firmware loader."); 253MODULE_DESCRIPTION("Emagic EMI 2|6 firmware loader.");
254MODULE_LICENSE("GPL"); 254MODULE_LICENSE("GPL");
255 255
diff --git a/drivers/usb/misc/emi62.c b/drivers/usb/misc/emi62.c
index 23153eac0dfa..4758cc5ccebc 100644
--- a/drivers/usb/misc/emi62.c
+++ b/drivers/usb/misc/emi62.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * Emagic EMI 2|6 usb audio interface firmware loader. 2 * Emagic EMI 2|6 usb audio interface firmware loader.
3 * Copyright (C) 2002 3 * Copyright (C) 2002
4 * Tapio Laxstrm (tapio.laxstrom@iptime.fi) 4 * Tapio Laxström (tapio.laxstrom@iptime.fi)
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License, as published by 7 * it under the terms of the GNU General Public License, as published by
@@ -292,7 +292,7 @@ static void __exit emi62_exit (void)
292module_init(emi62_init); 292module_init(emi62_init);
293module_exit(emi62_exit); 293module_exit(emi62_exit);
294 294
295MODULE_AUTHOR("tapio laxstrm"); 295MODULE_AUTHOR("Tapio Laxström");
296MODULE_DESCRIPTION("Emagic EMI 6|2m firmware loader."); 296MODULE_DESCRIPTION("Emagic EMI 6|2m firmware loader.");
297MODULE_LICENSE("GPL"); 297MODULE_LICENSE("GPL");
298 298
diff --git a/drivers/usb/serial/ChangeLog.history b/drivers/usb/serial/ChangeLog.history
index 52c4f7bd7a80..c1b279939bbf 100644
--- a/drivers/usb/serial/ChangeLog.history
+++ b/drivers/usb/serial/ChangeLog.history
@@ -400,7 +400,7 @@ visor.c Change Log comments:
400 400
401 (11/11/2001) gkh 401 (11/11/2001) gkh
402 Added support for the m125 devices, and added check to prevent oopses 402 Added support for the m125 devices, and added check to prevent oopses
403 for Cli devices that lie about the number of ports they have. 403 for Clié devices that lie about the number of ports they have.
404 404
405 (08/30/2001) gkh 405 (08/30/2001) gkh
406 Added support for the Clie devices, both the 3.5 and 4.0 os versions. 406 Added support for the Clie devices, both the 3.5 and 4.0 os versions.
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 65257867b34b..8a8a6b9fb05b 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -83,7 +83,7 @@
83 * 83 *
84 * (18/Jun/2003) Ian Abbott 84 * (18/Jun/2003) Ian Abbott
85 * Added Device ID of the USB relais from Rudolf Gugler (backported from 85 * Added Device ID of the USB relais from Rudolf Gugler (backported from
86 * Philipp Ghring's patch for 2.5.x kernel). 86 * Philipp Gühring's patch for 2.5.x kernel).
87 * Moved read transfer buffer reallocation into startup function. 87 * Moved read transfer buffer reallocation into startup function.
88 * Free existing write urb and transfer buffer in startup function. 88 * Free existing write urb and transfer buffer in startup function.
89 * Only use urbs in write urb pool that were successfully allocated. 89 * Only use urbs in write urb pool that were successfully allocated.
diff --git a/drivers/usb/serial/ftdi_sio.h b/drivers/usb/serial/ftdi_sio.h
index b57b90ae9f9d..b51cbb0eaa05 100644
--- a/drivers/usb/serial/ftdi_sio.h
+++ b/drivers/usb/serial/ftdi_sio.h
@@ -17,7 +17,7 @@
17 * Bill Ryder - bryder@sgi.com formerly of Silicon Graphics, Inc.- wrote the 17 * Bill Ryder - bryder@sgi.com formerly of Silicon Graphics, Inc.- wrote the
18 * FTDI_SIO implementation. 18 * FTDI_SIO implementation.
19 * 19 *
20 * Philipp Ghring - pg@futureware.at - added the Device ID of the USB relais 20 * Philipp Gühring - pg@futureware.at - added the Device ID of the USB relais
21 * from Rudolf Gugler 21 * from Rudolf Gugler
22 * 22 *
23 */ 23 */
@@ -44,7 +44,7 @@
44#define FTDI_ACTZWAVE_PID 0xF2D0 44#define FTDI_ACTZWAVE_PID 0xF2D0
45 45
46 46
47/* www.starting-point-systems.com Chameleon device */ 47/* www.starting-point-systems.com Chameleon device */
48#define FTDI_MICRO_CHAMELEON_PID 0xCAA0 /* Product Id */ 48#define FTDI_MICRO_CHAMELEON_PID 0xCAA0 /* Product Id */
49 49
50/* www.irtrans.de device */ 50/* www.irtrans.de device */
@@ -419,7 +419,7 @@
419 419
420/* 420/*
421 * Teratronik product ids. 421 * Teratronik product ids.
422 * Submitted by O. Wlfelschneider. 422 * Submitted by O. Wölfelschneider.
423 */ 423 */
424#define FTDI_TERATRONIK_VCP_PID 0xEC88 /* Teratronik device (preferring VCP driver on windows) */ 424#define FTDI_TERATRONIK_VCP_PID 0xEC88 /* Teratronik device (preferring VCP driver on windows) */
425#define FTDI_TERATRONIK_D2XX_PID 0xEC89 /* Teratronik device (preferring D2XX driver on windows) */ 425#define FTDI_TERATRONIK_D2XX_PID 0xEC89 /* Teratronik device (preferring D2XX driver on windows) */
diff --git a/drivers/usb/serial/ipaq.c b/drivers/usb/serial/ipaq.c
index e836ad07fdb9..9b38a08ac83a 100644
--- a/drivers/usb/serial/ipaq.c
+++ b/drivers/usb/serial/ipaq.c
@@ -306,7 +306,7 @@ static struct usb_device_id ipaq_id_table [] = {
306 { USB_DEVICE(0x0930, 0x0705) }, /* TOSHIBA Pocket PC e310 */ 306 { USB_DEVICE(0x0930, 0x0705) }, /* TOSHIBA Pocket PC e310 */
307 { USB_DEVICE(0x0930, 0x0706) }, /* TOSHIBA Pocket PC e740 */ 307 { USB_DEVICE(0x0930, 0x0706) }, /* TOSHIBA Pocket PC e740 */
308 { USB_DEVICE(0x0930, 0x0707) }, /* TOSHIBA Pocket PC e330 Series */ 308 { USB_DEVICE(0x0930, 0x0707) }, /* TOSHIBA Pocket PC e330 Series */
309 { USB_DEVICE(0x0930, 0x0708) }, /* TOSHIBA Pocket PC e350Series */ 309 { USB_DEVICE(0x0930, 0x0708) }, /* TOSHIBA Pocket PC e350 Series */
310 { USB_DEVICE(0x0930, 0x0709) }, /* TOSHIBA Pocket PC e750 Series */ 310 { USB_DEVICE(0x0930, 0x0709) }, /* TOSHIBA Pocket PC e750 Series */
311 { USB_DEVICE(0x0930, 0x070A) }, /* TOSHIBA Pocket PC e400 Series */ 311 { USB_DEVICE(0x0930, 0x070A) }, /* TOSHIBA Pocket PC e400 Series */
312 { USB_DEVICE(0x0930, 0x070B) }, /* TOSHIBA Pocket PC e800 Series */ 312 { USB_DEVICE(0x0930, 0x070B) }, /* TOSHIBA Pocket PC e800 Series */
@@ -488,7 +488,7 @@ static struct usb_device_id ipaq_id_table [] = {
488 { USB_DEVICE(0x0BF8, 0x1001) }, /* Fujitsu Siemens Computers USB Sync */ 488 { USB_DEVICE(0x0BF8, 0x1001) }, /* Fujitsu Siemens Computers USB Sync */
489 { USB_DEVICE(0x0C44, 0x03A2) }, /* Motorola iDEN Smartphone */ 489 { USB_DEVICE(0x0C44, 0x03A2) }, /* Motorola iDEN Smartphone */
490 { USB_DEVICE(0x0C8E, 0x6000) }, /* Cesscom Luxian Series */ 490 { USB_DEVICE(0x0C8E, 0x6000) }, /* Cesscom Luxian Series */
491 { USB_DEVICE(0x0CAD, 0x9001) }, /* Motorola PowerPad Pocket PCDevice */ 491 { USB_DEVICE(0x0CAD, 0x9001) }, /* Motorola PowerPad Pocket PC Device */
492 { USB_DEVICE(0x0F4E, 0x0200) }, /* Freedom Scientific USB Sync */ 492 { USB_DEVICE(0x0F4E, 0x0200) }, /* Freedom Scientific USB Sync */
493 { USB_DEVICE(0x0F98, 0x0201) }, /* Cyberbank USB Sync */ 493 { USB_DEVICE(0x0F98, 0x0201) }, /* Cyberbank USB Sync */
494 { USB_DEVICE(0x0FB8, 0x3001) }, /* Wistron USB Sync */ 494 { USB_DEVICE(0x0FB8, 0x3001) }, /* Wistron USB Sync */
diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c
index 6831dca93c1b..93a7724e167a 100644
--- a/drivers/usb/storage/isd200.c
+++ b/drivers/usb/storage/isd200.c
@@ -3,7 +3,7 @@
3 * $Id: isd200.c,v 1.16 2002/04/22 03:39:43 mdharm Exp $ 3 * $Id: isd200.c,v 1.16 2002/04/22 03:39:43 mdharm Exp $
4 * 4 *
5 * Current development and maintenance: 5 * Current development and maintenance:
6 * (C) 2001-2002 Bjrn Stenberg (bjorn@haxx.se) 6 * (C) 2001-2002 Björn Stenberg (bjorn@haxx.se)
7 * 7 *
8 * Developed with the assistance of: 8 * Developed with the assistance of:
9 * (C) 2002 Alan Stern <stern@rowland.org> 9 * (C) 2002 Alan Stern <stern@rowland.org>
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 9b656ec427d0..22ab2380367d 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -407,7 +407,7 @@ UNUSUAL_DEV( 0x04cb, 0x0100, 0x0000, 0x2210,
407 "FinePix 1400Zoom", 407 "FinePix 1400Zoom",
408 US_SC_UFI, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY | US_FL_SINGLE_LUN), 408 US_SC_UFI, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY | US_FL_SINGLE_LUN),
409 409
410/* Reported by Peter Wchtler <pwaechtler@loewe-komp.de> 410/* Reported by Peter Wächtler <pwaechtler@loewe-komp.de>
411 * The device needs the flags only. 411 * The device needs the flags only.
412 */ 412 */
413UNUSUAL_DEV( 0x04ce, 0x0002, 0x0074, 0x0074, 413UNUSUAL_DEV( 0x04ce, 0x0002, 0x0074, 0x0074,
@@ -1551,7 +1551,7 @@ UNUSUAL_DEV( 0x2735, 0x100b, 0x0000, 0x9999,
1551 US_FL_GO_SLOW ), 1551 US_FL_GO_SLOW ),
1552 1552
1553/* 1553/*
1554 * David Hrdeman <david@2gen.com> 1554 * David Härdeman <david@2gen.com>
1555 * The key makes the SCSI stack print confusing (but harmless) messages 1555 * The key makes the SCSI stack print confusing (but harmless) messages
1556 */ 1556 */
1557UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100, 1557UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x0100,
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c
index f2e243c353f9..4c9ec3f58c52 100644
--- a/drivers/video/amifb.c
+++ b/drivers/video/amifb.c
@@ -112,7 +112,7 @@
112 +----------+---------------------------------------------+----------+-------+ 112 +----------+---------------------------------------------+----------+-------+
113 | | ^ | | | 113 | | ^ | | |
114 | | |upper_margin | | | 114 | | |upper_margin | | |
115 | | | | | 115 | | v | | |
116 +----------###############################################----------+-------+ 116 +----------###############################################----------+-------+
117 | # ^ # | | 117 | # ^ # | |
118 | # | # | | 118 | # | # | |
@@ -133,15 +133,15 @@
133 | # | # | | 133 | # | # | |
134 | # | # | | 134 | # | # | |
135 | # | # | | 135 | # | # | |
136 | # # | | 136 | # v # | |
137 +----------###############################################----------+-------+ 137 +----------###############################################----------+-------+
138 | | ^ | | | 138 | | ^ | | |
139 | | |lower_margin | | | 139 | | |lower_margin | | |
140 | | | | | 140 | | v | | |
141 +----------+---------------------------------------------+----------+-------+ 141 +----------+---------------------------------------------+----------+-------+
142 | | ^ | | | 142 | | ^ | | |
143 | | |vsync_len | | | 143 | | |vsync_len | | |
144 | | | | | 144 | | v | | |
145 +----------+---------------------------------------------+----------+-------+ 145 +----------+---------------------------------------------+----------+-------+
146 146
147 147
@@ -325,7 +325,7 @@
325 CCIR -> PAL 325 CCIR -> PAL
326 ----------- 326 -----------
327 327
328 - a scanline is 64 s long, of which 52.48 s are visible. This is about 328 - a scanline is 64 s long, of which 52.48 s are visible. This is about
329 736 visible 70 ns pixels per line. 329 736 visible 70 ns pixels per line.
330 - we have 625 scanlines, of which 575 are visible (interlaced); after 330 - we have 625 scanlines, of which 575 are visible (interlaced); after
331 rounding this becomes 576. 331 rounding this becomes 576.
@@ -333,7 +333,7 @@
333 RETMA -> NTSC 333 RETMA -> NTSC
334 ------------- 334 -------------
335 335
336 - a scanline is 63.5 s long, of which 53.5 s are visible. This is about 336 - a scanline is 63.5 s long, of which 53.5 s are visible. This is about
337 736 visible 70 ns pixels per line. 337 736 visible 70 ns pixels per line.
338 - we have 525 scanlines, of which 485 are visible (interlaced); after 338 - we have 525 scanlines, of which 485 are visible (interlaced); after
339 rounding this becomes 484. 339 rounding this becomes 484.
@@ -802,7 +802,7 @@ static u_short ecs_palette[32];
802 802
803static u_short do_vmode_full = 0; /* Change the Video Mode */ 803static u_short do_vmode_full = 0; /* Change the Video Mode */
804static u_short do_vmode_pan = 0; /* Update the Video Mode */ 804static u_short do_vmode_pan = 0; /* Update the Video Mode */
805static short do_blank = 0; /* (Un)Blank the Screen (1) */ 805static short do_blank = 0; /* (Un)Blank the Screen (1) */
806static u_short do_cursor = 0; /* Move the Cursor */ 806static u_short do_cursor = 0; /* Move the Cursor */
807 807
808 808
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c
index abe0c435a664..d775eb6590b6 100644
--- a/drivers/video/aty/atyfb_base.c
+++ b/drivers/video/aty/atyfb_base.c
@@ -26,7 +26,7 @@
26 * Anthony Tong <atong@uiuc.edu> 26 * Anthony Tong <atong@uiuc.edu>
27 * 27 *
28 * Generic LCD support written by Daniel Mantione, ported from 2.4.20 by Alex Kern 28 * Generic LCD support written by Daniel Mantione, ported from 2.4.20 by Alex Kern
29 * Many Thanks to Ville Syrjl for patches and fixing nasting 16 bit color bug. 29 * Many Thanks to Ville Syrjälä for patches and fixing nasting 16 bit color bug.
30 * 30 *
31 * This file is subject to the terms and conditions of the GNU General Public 31 * This file is subject to the terms and conditions of the GNU General Public
32 * License. See the file COPYING in the main directory of this archive for 32 * License. See the file COPYING in the main directory of this archive for
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index e8e38edb9b5b..481d58f7535d 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -4,7 +4,7 @@
4 * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/ 4 * Linux framebuffer driver for Intel(R) 830M/845G/852GM/855GM/865G/915G/915GM/
5 * 945G/945GM integrated graphics chips. 5 * 945G/945GM integrated graphics chips.
6 * 6 *
7 * Copyright 2002, 2003 David Dawes <dawes@xfree86.org> 7 * Copyright 2002, 2003 David Dawes <dawes@xfree86.org>
8 * 2004 Sylvain Meyer 8 * 2004 Sylvain Meyer
9 * 2006 David Airlie 9 * 2006 David Airlie
10 * 10 *
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c
index 2a0e32074f7d..5f6fb7d2c408 100644
--- a/drivers/video/intelfb/intelfbhw.c
+++ b/drivers/video/intelfb/intelfbhw.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * Linux framebuffer driver for Intel(R) 865G integrated graphics chips. 4 * Linux framebuffer driver for Intel(R) 865G integrated graphics chips.
5 * 5 *
6 * Copyright 2002, 2003 David Dawes <dawes@xfree86.org> 6 * Copyright 2002, 2003 David Dawes <dawes@xfree86.org>
7 * 2004 Sylvain Meyer 7 * 2004 Sylvain Meyer
8 * 8 *
9 * This driver consists of two parts. The first part (intelfbdrv.c) provides 9 * This driver consists of two parts. The first part (intelfbdrv.c) provides
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index ae08d4587091..5857ccf5f6b1 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -56,7 +56,7 @@
56 * - Add support for different devices 56 * - Add support for different devices
57 * - Backlight support 57 * - Backlight support
58 * 58 *
59 * 2004-09-05: Herbert Ptzl <herbert@13thfloor.at> 59 * 2004-09-05: Herbert Pötzl <herbert@13thfloor.at>
60 * - added clock (de-)allocation code 60 * - added clock (de-)allocation code
61 * - added fixem fbmem option 61 * - added fixem fbmem option
62 * 62 *
@@ -64,7 +64,7 @@
64 * - code cleanup 64 * - code cleanup
65 * - added a forgotten return in h1940fb_init 65 * - added a forgotten return in h1940fb_init
66 * 66 *
67 * 2004-07-19: Herbert Ptzl <herbert@13thfloor.at> 67 * 2004-07-19: Herbert Pötzl <herbert@13thfloor.at>
68 * - code cleanup and extended debugging 68 * - code cleanup and extended debugging
69 * 69 *
70 * 2004-07-15: Arnaud Patard <arnaud.patard@rtp-net.org> 70 * 2004-07-15: Arnaud Patard <arnaud.patard@rtp-net.org>
diff --git a/drivers/watchdog/i6300esb.c b/drivers/watchdog/i6300esb.c
index c5982502c03d..f236954d2536 100644
--- a/drivers/watchdog/i6300esb.c
+++ b/drivers/watchdog/i6300esb.c
@@ -2,7 +2,7 @@
2 * i6300esb: Watchdog timer driver for Intel 6300ESB chipset 2 * i6300esb: Watchdog timer driver for Intel 6300ESB chipset
3 * 3 *
4 * (c) Copyright 2004 Google Inc. 4 * (c) Copyright 2004 Google Inc.
5 * (c) Copyright 2005 David Hrdeman <david@2gen.com> 5 * (c) Copyright 2005 David Härdeman <david@2gen.com>
6 * 6 *
7 * This program is free software; you can redistribute it and/or 7 * This program is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU General Public License 8 * modify it under the terms of the GNU General Public License
@@ -19,7 +19,7 @@
19 * Initial version 0.01 19 * Initial version 0.01
20 * 2004YYZZ Ross Biro 20 * 2004YYZZ Ross Biro
21 * Version 0.02 21 * Version 0.02
22 * 20050210 David Hrdeman <david@2gen.com> 22 * 20050210 David Härdeman <david@2gen.com>
23 * Ported driver to kernel 2.6 23 * Ported driver to kernel 2.6
24 */ 24 */
25 25
@@ -521,7 +521,7 @@ static void __exit watchdog_cleanup (void)
521module_init(watchdog_init); 521module_init(watchdog_init);
522module_exit(watchdog_cleanup); 522module_exit(watchdog_cleanup);
523 523
524MODULE_AUTHOR("Ross Biro and David Hrdeman"); 524MODULE_AUTHOR("Ross Biro and David Härdeman");
525MODULE_DESCRIPTION("Watchdog driver for Intel 6300ESB chipsets"); 525MODULE_DESCRIPTION("Watchdog driver for Intel 6300ESB chipsets");
526MODULE_LICENSE("GPL"); 526MODULE_LICENSE("GPL");
527MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 527MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/drivers/watchdog/iTCO_vendor_support.c b/drivers/watchdog/iTCO_vendor_support.c
index 415083990097..cafc465f2ae3 100644
--- a/drivers/watchdog/iTCO_vendor_support.c
+++ b/drivers/watchdog/iTCO_vendor_support.c
@@ -115,7 +115,7 @@ static void supermicro_old_pre_keepalive(unsigned long acpibase)
115 * For P4DPx: 115 * For P4DPx:
116 * BIOS setup -> Advanced -> I/O Device Configuration -> Watch Dog 116 * BIOS setup -> Advanced -> I/O Device Configuration -> Watch Dog
117 * This setting enables or disables Watchdog function. When enabled, the 117 * This setting enables or disables Watchdog function. When enabled, the
118 * default watchdog timer is set to be 5 minutes (about 435). It is 118 * default watchdog timer is set to be 5 minutes (about 4m35s). It is
119 * enough to load and run the OS. The application (service or driver) has 119 * enough to load and run the OS. The application (service or driver) has
120 * to take over the control once OS is running up and before watchdog 120 * to take over the control once OS is running up and before watchdog
121 * expires. 121 * expires.
diff --git a/drivers/watchdog/w83697hf_wdt.c b/drivers/watchdog/w83697hf_wdt.c
index d9e821d08deb..51826c216d6d 100644
--- a/drivers/watchdog/w83697hf_wdt.c
+++ b/drivers/watchdog/w83697hf_wdt.c
@@ -8,7 +8,7 @@
8 * which is based on wdt.c. 8 * which is based on wdt.c.
9 * Original copyright messages: 9 * Original copyright messages:
10 * 10 *
11 * (c) Copyright 2003 Pdraig Brady <P@draigBrady.com> 11 * (c) Copyright 2003 Pádraig Brady <P@draigBrady.com>
12 * 12 *
13 * (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl> 13 * (c) Copyright 2000-2001 Marek Michalkiewicz <marekm@linux.org.pl>
14 * 14 *
diff --git a/drivers/zorro/zorro.ids b/drivers/zorro/zorro.ids
index 5bd4b05d4c45..560fef2a7b1c 100644
--- a/drivers/zorro/zorro.ids
+++ b/drivers/zorro/zorro.ids
@@ -295,7 +295,7 @@
295 0100 RH 800C [HD Controller] 295 0100 RH 800C [HD Controller]
296 0200 RH 800C [RAM Expansion] 296 0200 RH 800C [RAM Expansion]
2970861 Kato 2970861 Kato
298# The Rainbow II and III are actually made by Ingenieurbro Helfrich 298# The Rainbow II and III are actually made by Ingenieurbüro Helfrich
299 2000 Rainbow II [Graphics Card] 299 2000 Rainbow II [Graphics Card]
300 2100 Rainbow III [Graphics Card] 300 2100 Rainbow III [Graphics Card]
301 8000 Melody MPEG [Audio Card] 301 8000 Melody MPEG [Audio Card]
diff --git a/fs/binfmt_em86.c b/fs/binfmt_em86.c
index 576dd7de2278..f95ae9789c91 100644
--- a/fs/binfmt_em86.c
+++ b/fs/binfmt_em86.c
@@ -2,7 +2,7 @@
2 * linux/fs/binfmt_em86.c 2 * linux/fs/binfmt_em86.c
3 * 3 *
4 * Based on linux/fs/binfmt_script.c 4 * Based on linux/fs/binfmt_script.c
5 * Copyright (C) 1996 Martin von Lwis 5 * Copyright (C) 1996 Martin von Löwis
6 * original #!-checking implemented by tytso. 6 * original #!-checking implemented by tytso.
7 * 7 *
8 * em86 changes Copyright (C) 1997 Jim Paradis 8 * em86 changes Copyright (C) 1997 Jim Paradis
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 42e94b3ab7be..b53c7e5f41bb 100644
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * binfmt_misc.c 2 * binfmt_misc.c
3 * 3 *
4 * Copyright (C) 1997 Richard Gnther 4 * Copyright (C) 1997 Richard Günther
5 * 5 *
6 * binfmt_misc detects binaries via a magic or filename extension and invokes 6 * binfmt_misc detects binaries via a magic or filename extension and invokes
7 * a specified wrapper. This should obsolete binfmt_java, binfmt_em86 and 7 * a specified wrapper. This should obsolete binfmt_java, binfmt_em86 and
diff --git a/fs/binfmt_script.c b/fs/binfmt_script.c
index 4d0e0f6d3273..ab33939b12a7 100644
--- a/fs/binfmt_script.c
+++ b/fs/binfmt_script.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * linux/fs/binfmt_script.c 2 * linux/fs/binfmt_script.c
3 * 3 *
4 * Copyright (C) 1996 Martin von Lwis 4 * Copyright (C) 1996 Martin von Löwis
5 * original #!-checking implemented by tytso. 5 * original #!-checking implemented by tytso.
6 */ 6 */
7 7
diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c
index aa359a2e4ce6..09e3d306e96f 100644
--- a/fs/isofs/inode.c
+++ b/fs/isofs/inode.c
@@ -3,7 +3,7 @@
3 * 3 *
4 * (C) 1991 Linus Torvalds - minix filesystem 4 * (C) 1991 Linus Torvalds - minix filesystem
5 * 1992, 1993, 1994 Eric Youngdale Modified for ISO 9660 filesystem. 5 * 1992, 1993, 1994 Eric Youngdale Modified for ISO 9660 filesystem.
6 * 1994 Eberhard Moenkeberg - multi session handling. 6 * 1994 Eberhard Mönkeberg - multi session handling.
7 * 1995 Mark Dobie - allow mounting of some weird VideoCDs and PhotoCDs. 7 * 1995 Mark Dobie - allow mounting of some weird VideoCDs and PhotoCDs.
8 * 1997 Gordon Chaffee - Joliet CDs 8 * 1997 Gordon Chaffee - Joliet CDs
9 * 1998 Eric Lammerts - ISO 9660 Level 3 9 * 1998 Eric Lammerts - ISO 9660 Level 3
diff --git a/fs/nfs/nfsroot.c b/fs/nfs/nfsroot.c
index e87b44ee9ac9..4b0334590ee5 100644
--- a/fs/nfs/nfsroot.c
+++ b/fs/nfs/nfsroot.c
@@ -43,7 +43,7 @@
43 * from being used (thanks to Leo Spiekman) 43 * from being used (thanks to Leo Spiekman)
44 * Andy Walker : Allow to specify the NFS server in nfs_root 44 * Andy Walker : Allow to specify the NFS server in nfs_root
45 * without giving a path name 45 * without giving a path name
46 * Swen Thmmler : Allow to specify the NFS options in nfs_root 46 * Swen Thümmler : Allow to specify the NFS options in nfs_root
47 * without giving a path name. Fix BOOTP request 47 * without giving a path name. Fix BOOTP request
48 * for domainname (domainname is NIS domain, not 48 * for domainname (domainname is NIS domain, not
49 * DNS domain!). Skip dummy devices for BOOTP. 49 * DNS domain!). Skip dummy devices for BOOTP.
diff --git a/fs/ntfs/ChangeLog b/fs/ntfs/ChangeLog
index 345798ebd366..ff2c79c8eddc 100644
--- a/fs/ntfs/ChangeLog
+++ b/fs/ntfs/ChangeLog
@@ -382,7 +382,7 @@ ToDo/Notes:
382 own locking so it does not matter if the vfs inode is locked. 382 own locking so it does not matter if the vfs inode is locked.
383 - Fix bug in mft record writing where we forgot to set the device in 383 - Fix bug in mft record writing where we forgot to set the device in
384 the buffers when mapping them after the VM had discarded them. 384 the buffers when mapping them after the VM had discarded them.
385 Thanks to Martin MOKREJŠ for the bug report. 385 Thanks to Martin MOKREJÅ for the bug report.
386 386
3872.1.22 - Many bug and race fixes and error handling improvements. 3872.1.22 - Many bug and race fixes and error handling improvements.
388 388
diff --git a/fs/ntfs/sysctl.c b/fs/ntfs/sysctl.c
index 4847fbfb0107..9ef85e628fe1 100644
--- a/fs/ntfs/sysctl.c
+++ b/fs/ntfs/sysctl.c
@@ -1,7 +1,7 @@
1/* 1/*
2 * sysctl.c - Code for sysctl handling in NTFS Linux kernel driver. Part of 2 * sysctl.c - Code for sysctl handling in NTFS Linux kernel driver. Part of
3 * the Linux-NTFS project. Adapted from the old NTFS driver, 3 * the Linux-NTFS project. Adapted from the old NTFS driver,
4 * Copyright (C) 1997 Martin von Lwis, Rgis Duchesne 4 * Copyright (C) 1997 Martin von Löwis, Régis Duchesne
5 * 5 *
6 * Copyright (c) 2002-2005 Anton Altaparmakov 6 * Copyright (c) 2002-2005 Anton Altaparmakov
7 * 7 *
diff --git a/fs/ntfs/sysctl.h b/fs/ntfs/sysctl.h
index beda5bf96405..d4f8ce920d95 100644
--- a/fs/ntfs/sysctl.h
+++ b/fs/ntfs/sysctl.h
@@ -1,7 +1,7 @@
1/* 1/*
2 * sysctl.h - Defines for sysctl handling in NTFS Linux kernel driver. Part of 2 * sysctl.h - Defines for sysctl handling in NTFS Linux kernel driver. Part of
3 * the Linux-NTFS project. Adapted from the old NTFS driver, 3 * the Linux-NTFS project. Adapted from the old NTFS driver,
4 * Copyright (C) 1997 Martin von Lwis, Rgis Duchesne 4 * Copyright (C) 1997 Martin von Löwis, Régis Duchesne
5 * 5 *
6 * Copyright (c) 2002-2004 Anton Altaparmakov 6 * Copyright (c) 2002-2004 Anton Altaparmakov
7 * 7 *
diff --git a/fs/super.c b/fs/super.c
index ed1b93ca213c..ceaf2e3d594c 100644
--- a/fs/super.c
+++ b/fs/super.c
@@ -15,7 +15,7 @@
15 * Added kerneld support: Jacques Gelinas and Bjorn Ekwall 15 * Added kerneld support: Jacques Gelinas and Bjorn Ekwall
16 * Added change_root: Werner Almesberger & Hans Lermen, Feb '96 16 * Added change_root: Werner Almesberger & Hans Lermen, Feb '96
17 * Added options to /proc/mounts: 17 * Added options to /proc/mounts:
18 * Torbjrn Lindh (torbjorn.lindh@gopta.se), April 14, 1996. 18 * Torbjörn Lindh (torbjorn.lindh@gopta.se), April 14, 1996.
19 * Added devfs support: Richard Gooch <rgooch@atnf.csiro.au>, 13-JAN-1998 19 * Added devfs support: Richard Gooch <rgooch@atnf.csiro.au>, 13-JAN-1998
20 * Heavily rewritten for 'one fs - one tree' dcache architecture. AV, Mar 2000 20 * Heavily rewritten for 'one fs - one tree' dcache architecture. AV, Mar 2000
21 */ 21 */
diff --git a/include/asm-arm/arch-aaec2000/aaec2000.h b/include/asm-arm/arch-aaec2000/aaec2000.h
index 002227924b9f..a6d1ee0980f2 100644
--- a/include/asm-arm/arch-aaec2000/aaec2000.h
+++ b/include/asm-arm/arch-aaec2000/aaec2000.h
@@ -140,11 +140,11 @@
140#define TIMER3_CLEAR __REG(0x80000e0c) /* Timer 3 Clear Register */ 140#define TIMER3_CLEAR __REG(0x80000e0c) /* Timer 3 Clear Register */
141 141
142/* Timer Control register bits */ 142/* Timer Control register bits */
143#define TIMER_CTRL_ENABLE (1 << 7) /* Enable (Start° Timer */ 143#define TIMER_CTRL_ENABLE (1 << 7) /* Enable (Start Timer) */
144#define TIMER_CTRL_PERIODIC (1 << 6) /* Periodic Running Mode */ 144#define TIMER_CTRL_PERIODIC (1 << 6) /* Periodic Running Mode */
145#define TIMER_CTRL_FREE_RUNNING (0 << 6) /* Normal Running Mode */ 145#define TIMER_CTRL_FREE_RUNNING (0 << 6) /* Normal Running Mode */
146#define TIMER_CTRL_CLKSEL_508K (1 << 3) /* 508KHz Clock select (Timer 1, 2) */ 146#define TIMER_CTRL_CLKSEL_508K (1 << 3) /* 508KHz Clock select (Timer 1, 2) */
147#define TIMER_CTRL_CLKSEL_2K (0 << 3) /* 2KHz Clock Select (Timer 1, 2)*/ 147#define TIMER_CTRL_CLKSEL_2K (0 << 3) /* 2KHz Clock Select (Timer 1, 2) */
148 148
149/* Power and State Control */ 149/* Power and State Control */
150#define POWER_BASE __REG(0x80000400) 150#define POWER_BASE __REG(0x80000400)
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
index 2b641b176e7f..b6e4b52350aa 100644
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
@@ -2,7 +2,7 @@
2 * -- <linux/cdrom.h> 2 * -- <linux/cdrom.h>
3 * General header file for linux CD-ROM drivers 3 * General header file for linux CD-ROM drivers
4 * Copyright (C) 1992 David Giller, rafetmad@oxy.edu 4 * Copyright (C) 1992 David Giller, rafetmad@oxy.edu
5 * 1994, 1995 Eberhard Moenkeberg, emoenke@gwdg.de 5 * 1994, 1995 Eberhard Mönkeberg, emoenke@gwdg.de
6 * 1996 David van Leeuwen, david@tm.tno.nl 6 * 1996 David van Leeuwen, david@tm.tno.nl
7 * 1997, 1998 Erik Andersen, andersee@debian.org 7 * 1997, 1998 Erik Andersen, andersee@debian.org
8 * 1998-2002 Jens Axboe, axboe@suse.de 8 * 1998-2002 Jens Axboe, axboe@suse.de
diff --git a/net/ax25/ax25_ds_in.c b/net/ax25/ax25_ds_in.c
index e37d217a986a..8273b1200eee 100644
--- a/net/ax25/ax25_ds_in.c
+++ b/net/ax25/ax25_ds_in.c
@@ -75,7 +75,7 @@ static int ax25_ds_state1_machine(ax25_cb *ax25, struct sk_buff *skb, int framet
75 } 75 }
76 ax25_dama_on(ax25); 76 ax25_dama_on(ax25);
77 77
78 /* according to DK4EGs spec we are required to 78 /* according to DK4EG's spec we are required to
79 * send a RR RESPONSE FINAL NR=0. 79 * send a RR RESPONSE FINAL NR=0.
80 */ 80 */
81 81
diff --git a/net/ax25/ax25_ds_subr.c b/net/ax25/ax25_ds_subr.c
index a49773ff2b92..b5e59787be2f 100644
--- a/net/ax25/ax25_ds_subr.c
+++ b/net/ax25/ax25_ds_subr.c
@@ -41,7 +41,7 @@ void ax25_ds_enquiry_response(ax25_cb *ax25)
41 ax25_cb *ax25o; 41 ax25_cb *ax25o;
42 struct hlist_node *node; 42 struct hlist_node *node;
43 43
44 /* Please note that neither DK4EGs nor DG2FEFs 44 /* Please note that neither DK4EG's nor DG2FEF's
45 * DAMA spec mention the following behaviour as seen 45 * DAMA spec mention the following behaviour as seen
46 * with TheFirmware: 46 * with TheFirmware:
47 * 47 *
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index 1f78c3e336d8..347e935faaf0 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -2,7 +2,7 @@
2 BNEP implementation for Linux Bluetooth stack (BlueZ). 2 BNEP implementation for Linux Bluetooth stack (BlueZ).
3 Copyright (C) 2001-2002 Inventel Systemes 3 Copyright (C) 2001-2002 Inventel Systemes
4 Written 2001-2002 by 4 Written 2001-2002 by
5 Clment Moreau <clement.moreau@inventel.fr> 5 Clément Moreau <clement.moreau@inventel.fr>
6 David Libault <david.libault@inventel.fr> 6 David Libault <david.libault@inventel.fr>
7 7
8 Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com> 8 Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com>
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c
index 9092816f58de..95e3837e4312 100644
--- a/net/bluetooth/bnep/netdev.c
+++ b/net/bluetooth/bnep/netdev.c
@@ -2,7 +2,7 @@
2 BNEP implementation for Linux Bluetooth stack (BlueZ). 2 BNEP implementation for Linux Bluetooth stack (BlueZ).
3 Copyright (C) 2001-2002 Inventel Systemes 3 Copyright (C) 2001-2002 Inventel Systemes
4 Written 2001-2002 by 4 Written 2001-2002 by
5 Clment Moreau <clement.moreau@inventel.fr> 5 Clément Moreau <clement.moreau@inventel.fr>
6 David Libault <david.libault@inventel.fr> 6 David Libault <david.libault@inventel.fr>
7 7
8 Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com> 8 Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com>
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index d5a09eaef915..817169e718c1 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -871,7 +871,7 @@ static int translate_table(char *name, struct ebt_table_info *newinfo)
871 return -EINVAL; 871 return -EINVAL;
872 } 872 }
873 873
874 /* we now know the following (along with E=mc): 874 /* we now know the following (along with E=mc):
875 - the nr of entries in each chain is right 875 - the nr of entries in each chain is right
876 - the size of the allocated space is right 876 - the size of the allocated space is right
877 - all valid hooks have a corresponding chain 877 - all valid hooks have a corresponding chain
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 7ac703171ff3..c4719edb55c0 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -6,7 +6,7 @@
6 * 6 *
7 * Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> 7 * Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
8 * Ben Greear <greearb@candelatech.com> 8 * Ben Greear <greearb@candelatech.com>
9 * Jens Ls <jens.laas@data.slu.se> 9 * Jens Låås <jens.laas@data.slu.se>
10 * 10 *
11 * This program is free software; you can redistribute it and/or 11 * This program is free software; you can redistribute it and/or
12 * modify it under the terms of the GNU General Public License 12 * modify it under the terms of the GNU General Public License
diff --git a/net/irda/iriap.c b/net/irda/iriap.c
index ee3889fa49ab..dc5e34a01620 100644
--- a/net/irda/iriap.c
+++ b/net/irda/iriap.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Troms admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *
diff --git a/net/irda/iriap_event.c b/net/irda/iriap_event.c
index 99b18dc7a0b7..8fb9d7277ca8 100644
--- a/net/irda/iriap_event.c
+++ b/net/irda/iriap_event.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Troms admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *
diff --git a/net/irda/irias_object.c b/net/irda/irias_object.c
index cf302457097b..cbcf04380f3a 100644
--- a/net/irda/irias_object.c
+++ b/net/irda/irias_object.c
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Troms admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c
index 87039c2fb6a2..fff52d57a200 100644
--- a/net/irda/irlan/irlan_client.c
+++ b/net/irda/irlan/irlan_client.c
@@ -20,7 +20,7 @@
20 * published by the Free Software Foundation; either version 2 of 20 * published by the Free Software Foundation; either version 2 of
21 * the License, or (at your option) any later version. 21 * the License, or (at your option) any later version.
22 * 22 *
23 * Neither Dag Brattli nor University of Troms admit liability nor 23 * Neither Dag Brattli nor University of Tromsø admit liability nor
24 * provide warranty for any of this software. This material is 24 * provide warranty for any of this software. This material is
25 * provided "AS-IS" and at no charge. 25 * provided "AS-IS" and at no charge.
26 * 26 *
diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c
index f5778ef3ccc7..a4b56e25a917 100644
--- a/net/irda/irlan/irlan_common.c
+++ b/net/irda/irlan/irlan_common.c
@@ -17,7 +17,7 @@
17 * published by the Free Software Foundation; either version 2 of 17 * published by the Free Software Foundation; either version 2 of
18 * the License, or (at your option) any later version. 18 * the License, or (at your option) any later version.
19 * 19 *
20 * Neither Dag Brattli nor University of Troms admit liability nor 20 * Neither Dag Brattli nor University of Tromsø admit liability nor
21 * provide warranty for any of this software. This material is 21 * provide warranty for any of this software. This material is
22 * provided "AS-IS" and at no charge. 22 * provided "AS-IS" and at no charge.
23 * 23 *
diff --git a/net/irda/irlan/irlan_eth.c b/net/irda/irlan/irlan_eth.c
index 340f04a36b02..7f9c8542e5fc 100644
--- a/net/irda/irlan/irlan_eth.c
+++ b/net/irda/irlan/irlan_eth.c
@@ -19,7 +19,7 @@
19 * published by the Free Software Foundation; either version 2 of 19 * published by the Free Software Foundation; either version 2 of
20 * the License, or (at your option) any later version. 20 * the License, or (at your option) any later version.
21 * 21 *
22 * Neither Dag Brattli nor University of Troms admit liability nor 22 * Neither Dag Brattli nor University of Tromsø admit liability nor
23 * provide warranty for any of this software. This material is 23 * provide warranty for any of this software. This material is
24 * provided "AS-IS" and at no charge. 24 * provided "AS-IS" and at no charge.
25 * 25 *
diff --git a/net/irda/irlan/irlan_event.c b/net/irda/irlan/irlan_event.c
index 623e0fd16c19..a9750a801388 100644
--- a/net/irda/irlan/irlan_event.c
+++ b/net/irda/irlan/irlan_event.c
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Troms admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/net/irda/irlan/irlan_provider.c b/net/irda/irlan/irlan_provider.c
index aac66434e473..13db942812e4 100644
--- a/net/irda/irlan/irlan_provider.c
+++ b/net/irda/irlan/irlan_provider.c
@@ -20,7 +20,7 @@
20 * published by the Free Software Foundation; either version 2 of 20 * published by the Free Software Foundation; either version 2 of
21 * the License, or (at your option) any later version. 21 * the License, or (at your option) any later version.
22 * 22 *
23 * Neither Dag Brattli nor University of Troms admit liability nor 23 * Neither Dag Brattli nor University of Tromsø admit liability nor
24 * provide warranty for any of this software. This material is 24 * provide warranty for any of this software. This material is
25 * provided "AS-IS" and at no charge. 25 * provided "AS-IS" and at no charge.
26 * 26 *
diff --git a/net/irda/irlan/irlan_provider_event.c b/net/irda/irlan/irlan_provider_event.c
index ef401bd6ea00..10ece5a47522 100644
--- a/net/irda/irlan/irlan_provider_event.c
+++ b/net/irda/irlan/irlan_provider_event.c
@@ -16,7 +16,7 @@
16 * published by the Free Software Foundation; either version 2 of 16 * published by the Free Software Foundation; either version 2 of
17 * the License, or (at your option) any later version. 17 * the License, or (at your option) any later version.
18 * 18 *
19 * Neither Dag Brattli nor University of Troms admit liability nor 19 * Neither Dag Brattli nor University of Tromsø admit liability nor
20 * provide warranty for any of this software. This material is 20 * provide warranty for any of this software. This material is
21 * provided "AS-IS" and at no charge. 21 * provided "AS-IS" and at no charge.
22 * 22 *
diff --git a/net/irda/irlap_event.c b/net/irda/irlap_event.c
index a8b8873aa263..4c33bf5c8354 100644
--- a/net/irda/irlap_event.c
+++ b/net/irda/irlap_event.c
@@ -19,7 +19,7 @@
19 * published by the Free Software Foundation; either version 2 of 19 * published by the Free Software Foundation; either version 2 of
20 * the License, or (at your option) any later version. 20 * the License, or (at your option) any later version.
21 * 21 *
22 * Neither Dag Brattli nor University of Troms admit liability nor 22 * Neither Dag Brattli nor University of Tromsø admit liability nor
23 * provide warranty for any of this software. This material is 23 * provide warranty for any of this software. This material is
24 * provided "AS-IS" and at no charge. 24 * provided "AS-IS" and at no charge.
25 * 25 *
diff --git a/net/irda/irlap_frame.c b/net/irda/irlap_frame.c
index 77ac27e81161..4f3764546b2f 100644
--- a/net/irda/irlap_frame.c
+++ b/net/irda/irlap_frame.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Troms admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *
diff --git a/net/irda/irlmp.c b/net/irda/irlmp.c
index 7db92ced2c02..cedff8068fbc 100644
--- a/net/irda/irlmp.c
+++ b/net/irda/irlmp.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Troms admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *
diff --git a/net/irda/irlmp_event.c b/net/irda/irlmp_event.c
index 65ffa981510a..1bba87e78609 100644
--- a/net/irda/irlmp_event.c
+++ b/net/irda/irlmp_event.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Troms admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *
diff --git a/net/irda/irlmp_frame.c b/net/irda/irlmp_frame.c
index 559302d3fe66..0a79d9aeb08c 100644
--- a/net/irda/irlmp_frame.c
+++ b/net/irda/irlmp_frame.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Troms admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *
diff --git a/net/irda/irmod.c b/net/irda/irmod.c
index 8ba703da2797..01554b996b9b 100644
--- a/net/irda/irmod.c
+++ b/net/irda/irmod.c
@@ -17,7 +17,7 @@
17 * published by the Free Software Foundation; either version 2 of 17 * published by the Free Software Foundation; either version 2 of
18 * the License, or (at your option) any later version. 18 * the License, or (at your option) any later version.
19 * 19 *
20 * Neither Dag Brattli nor University of Troms admit liability nor 20 * Neither Dag Brattli nor University of Tromsø admit liability nor
21 * provide warranty for any of this software. This material is 21 * provide warranty for any of this software. This material is
22 * provided "AS-IS" and at no charge. 22 * provided "AS-IS" and at no charge.
23 * 23 *
diff --git a/net/irda/irqueue.c b/net/irda/irqueue.c
index d058b467f9e4..40c28efaed95 100644
--- a/net/irda/irqueue.c
+++ b/net/irda/irqueue.c
@@ -28,7 +28,7 @@
28 * published by the Free Software Foundation; either version 2 of 28 * published by the Free Software Foundation; either version 2 of
29 * the License, or (at your option) any later version. 29 * the License, or (at your option) any later version.
30 * 30 *
31 * Neither Dag Brattli nor University of Troms admit liability nor 31 * Neither Dag Brattli nor University of Tromsø admit liability nor
32 * provide warranty for any of this software. This material is 32 * provide warranty for any of this software. This material is
33 * provided "AS-IS" and at no charge. 33 * provided "AS-IS" and at no charge.
34 * 34 *
diff --git a/net/irda/irsysctl.c b/net/irda/irsysctl.c
index 525343a1c521..565cbf0421cd 100644
--- a/net/irda/irsysctl.c
+++ b/net/irda/irsysctl.c
@@ -17,7 +17,7 @@
17 * published by the Free Software Foundation; either version 2 of 17 * published by the Free Software Foundation; either version 2 of
18 * the License, or (at your option) any later version. 18 * the License, or (at your option) any later version.
19 * 19 *
20 * Neither Dag Brattli nor University of Troms admit liability nor 20 * Neither Dag Brattli nor University of Tromsø admit liability nor
21 * provide warranty for any of this software. This material is 21 * provide warranty for any of this software. This material is
22 * provided "AS-IS" and at no charge. 22 * provided "AS-IS" and at no charge.
23 * 23 *
diff --git a/net/irda/irttp.c b/net/irda/irttp.c
index 1311976c9dfe..97db158c9274 100644
--- a/net/irda/irttp.c
+++ b/net/irda/irttp.c
@@ -18,7 +18,7 @@
18 * published by the Free Software Foundation; either version 2 of 18 * published by the Free Software Foundation; either version 2 of
19 * the License, or (at your option) any later version. 19 * the License, or (at your option) any later version.
20 * 20 *
21 * Neither Dag Brattli nor University of Troms admit liability nor 21 * Neither Dag Brattli nor University of Tromsø admit liability nor
22 * provide warranty for any of this software. This material is 22 * provide warranty for any of this software. This material is
23 * provided "AS-IS" and at no charge. 23 * provided "AS-IS" and at no charge.
24 * 24 *