aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS4
-rw-r--r--Documentation/sound/oss/ALS4
-rw-r--r--MAINTAINERS2
-rw-r--r--drivers/platform/x86/fujitsu-laptop.c2
-rw-r--r--drivers/usb/storage/unusual_devs.h2
-rw-r--r--sound/isa/als100.c2
-rw-r--r--sound/pci/hda/patch_realtek.c2
7 files changed, 9 insertions, 9 deletions
diff --git a/CREDITS b/CREDITS
index 370b4c7da39b..d8fe12a9421f 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3814,8 +3814,8 @@ D: INFO-SHEET, former maintainer
3814D: Author of the longest-living linux bug 3814D: Author of the longest-living linux bug
3815 3815
3816N: Jonathan Woithe 3816N: Jonathan Woithe
3817E: jwoithe@physics.adelaide.edu.au 3817E: jwoithe@just42.net
3818W: http://www.physics.adelaide.edu.au/~jwoithe 3818W: http:/www.just42.net/jwoithe
3819D: ALS-007 sound card extensions to Sound Blaster driver 3819D: ALS-007 sound card extensions to Sound Blaster driver
3820S: 20 Jordan St 3820S: 20 Jordan St
3821S: Valley View, SA 5093 3821S: Valley View, SA 5093
diff --git a/Documentation/sound/oss/ALS b/Documentation/sound/oss/ALS
index d01ffbfd5808..bf10bed4574b 100644
--- a/Documentation/sound/oss/ALS
+++ b/Documentation/sound/oss/ALS
@@ -57,10 +57,10 @@ The resulting sound driver will provide the following capabilities:
57 DSP/PCM/audio out (L&R), FM (L&R) and Mic in (mono). 57 DSP/PCM/audio out (L&R), FM (L&R) and Mic in (mono).
58 58
59Jonathan Woithe 59Jonathan Woithe
60jwoithe@physics.adelaide.edu.au 60jwoithe@just42.net
6130 March 1998 6130 March 1998
62 62
63Modified 2000-02-26 by Dave Forrest, drf5n@virginia.edu to add ALS100/ALS200 63Modified 2000-02-26 by Dave Forrest, drf5n@virginia.edu to add ALS100/ALS200
64Modified 2000-04-10 by Paul Laufer, pelaufer@csupomona.edu to add ISAPnP info. 64Modified 2000-04-10 by Paul Laufer, pelaufer@csupomona.edu to add ISAPnP info.
65Modified 2000-11-19 by Jonathan Woithe, jwoithe@physics.adelaide.edu.au 65Modified 2000-11-19 by Jonathan Woithe, jwoithe@just42.net
66 - updated information for kernel 2.4.x. 66 - updated information for kernel 2.4.x.
diff --git a/MAINTAINERS b/MAINTAINERS
index 252972b6c4a0..1435e6a83dae 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2839,7 +2839,7 @@ S: Maintained
2839F: arch/frv/ 2839F: arch/frv/
2840 2840
2841FUJITSU LAPTOP EXTRAS 2841FUJITSU LAPTOP EXTRAS
2842M: Jonathan Woithe <jwoithe@physics.adelaide.edu.au> 2842M: Jonathan Woithe <jwoithe@just42.net>
2843L: platform-driver-x86@vger.kernel.org 2843L: platform-driver-x86@vger.kernel.org
2844S: Maintained 2844S: Maintained
2845F: drivers/platform/x86/fujitsu-laptop.c 2845F: drivers/platform/x86/fujitsu-laptop.c
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
index 6b26666b37f2..c4c1a5444b38 100644
--- a/drivers/platform/x86/fujitsu-laptop.c
+++ b/drivers/platform/x86/fujitsu-laptop.c
@@ -1,7 +1,7 @@
1/*-*-linux-c-*-*/ 1/*-*-linux-c-*-*/
2 2
3/* 3/*
4 Copyright (C) 2007,2008 Jonathan Woithe <jwoithe@physics.adelaide.edu.au> 4 Copyright (C) 2007,2008 Jonathan Woithe <jwoithe@just42.net>
5 Copyright (C) 2008 Peter Gruber <nokos@gmx.net> 5 Copyright (C) 2008 Peter Gruber <nokos@gmx.net>
6 Copyright (C) 2008 Tony Vroon <tony@linx.net> 6 Copyright (C) 2008 Tony Vroon <tony@linx.net>
7 Based on earlier work: 7 Based on earlier work:
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
index 856ad92c40de..26844514ac5f 100644
--- a/drivers/usb/storage/unusual_devs.h
+++ b/drivers/usb/storage/unusual_devs.h
@@ -110,7 +110,7 @@ UNUSUAL_DEV( 0x040d, 0x6205, 0x0003, 0x0003,
110 USB_SC_DEVICE, USB_PR_DEVICE, NULL, 110 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
111 US_FL_IGNORE_RESIDUE ), 111 US_FL_IGNORE_RESIDUE ),
112 112
113/* Deduced by Jonathan Woithe <jwoithe@physics.adelaide.edu.au> 113/* Deduced by Jonathan Woithe <jwoithe@just42.net>
114 * Entry needed for flags: US_FL_FIX_INQUIRY because initial inquiry message 114 * Entry needed for flags: US_FL_FIX_INQUIRY because initial inquiry message
115 * always fails and confuses drive. 115 * always fails and confuses drive.
116 */ 116 */
diff --git a/sound/isa/als100.c b/sound/isa/als100.c
index d1f4351fb6ee..2d67c78c9f4b 100644
--- a/sound/isa/als100.c
+++ b/sound/isa/als100.c
@@ -7,7 +7,7 @@
7 Thanks to Pierfrancesco 'qM2' Passerini. 7 Thanks to Pierfrancesco 'qM2' Passerini.
8 8
9 Generalised for soundcards based on DT-0196 and ALS-007 chips 9 Generalised for soundcards based on DT-0196 and ALS-007 chips
10 by Jonathan Woithe <jwoithe@physics.adelaide.edu.au>: June 2002. 10 by Jonathan Woithe <jwoithe@just42.net>: June 2002.
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/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index a8e82be3d2fc..f6316507d764 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -6,7 +6,7 @@
6 * Copyright (c) 2004 Kailang Yang <kailang@realtek.com.tw> 6 * Copyright (c) 2004 Kailang Yang <kailang@realtek.com.tw>
7 * PeiSen Hou <pshou@realtek.com.tw> 7 * PeiSen Hou <pshou@realtek.com.tw>
8 * Takashi Iwai <tiwai@suse.de> 8 * Takashi Iwai <tiwai@suse.de>
9 * Jonathan Woithe <jwoithe@physics.adelaide.edu.au> 9 * Jonathan Woithe <jwoithe@just42.net>
10 * 10 *
11 * This driver is free software; you can redistribute it and/or modify 11 * This driver is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by