Manual merge with Linus.

Conflicts: arch/powerpc/kernel/setup-common.c drivers/input/keyboard/hil_kbd.c drivers/input/mouse/hil_ptr.c
author: Dmitry Torokhov <dtor_core@ameritech.net> 2006-04-02 00:08:05 -0500
committer: Dmitry Torokhov <dtor_core@ameritech.net> 2006-04-02 00:08:05 -0500
commit: 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch)
tree: 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /CREDITS
parent: 642fde17dceceb56c7ba2762733ac688666ae657 (diff)
parent: 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff)
1 files changed, 14 insertions, 9 deletions
diff --git a/CREDITS b/CREDITS
index 64511e2abc8e..0bf31eac6dc2 100644
--- a/CREDITS
+++ b/CREDITS
@@ -120,7 +120,6 @@ D: Author of lil (Linux Interrupt Latency benchmark)
 D: Fixed the shm swap deallocation at swapoff time (try_to_unuse message)
 D: VM hacker
 D: Various other kernel hacks
-S: Via Cicalini 26
 S: Imola 40026
 S: Italy
@@ -1128,8 +1127,10 @@ S: Carnegie, Pennsylvania 15106-4304
 S: USA
 N: Philip Gladstone
-E: philip@raptor.com
+E: philip@gladstonefamily.net
 D: Kernel / timekeeping stuff
+S: Carlisle, MA 01741
+S: USA
  
 N: Jan-Benedict Glaw
 E: jbglaw@lug-owl.de
@@ -2008,13 +2009,14 @@ S: University of Stuttgart, Germany and
 S: Ecole Nationale Superieure des Telecommunications, Paris
 N: Jamie Lokier
-E: jamie@imbolc.ucc.ie
+E: jamie@shareable.org
+W: http://www.shareable.org/
 D: Reboot-through-BIOS for broken 486 motherboards
-D: Some parport fixes
+D: Parport fixes, futex improvements
-S: 11 Goodson Walk
+D: First instruction of x86 sysenter path :)
-S: Marston
+S: 51 Sunningwell Road
 S: Oxford
-S: OX3 0HX
+S: OX1 4SZ
 S: United Kingdom
 N: Mark Lord
@@ -2814,6 +2816,8 @@ E: luca.risolia@studio.unibo.it
 P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958  5D40 99DA 5D2A FCE6 35A4
 D: V4L driver for W996[87]CF JPEG USB Dual Mode Camera Chips
 D: V4L2 driver for SN9C10x PC Camera Controllers
+D: V4L2 driver for ET61X151 and ET61X251 PC Camera Controllers
+D: V4L2 driver for ZC0301 Image Processor and Control Chip
 S: Via Liberta' 41/A
 S: Osio Sotto, 24046, Bergamo
 S: Italy
@@ -3739,10 +3743,11 @@ D: Mylex DAC960 PCI RAID driver
 D: Miscellaneous kernel fixes
 N: Alessandro Zummo
-E: azummo@ita.flashnet.it
+E: a.zummo@towertech.it
-W: http://freepage.logicom.it/azummo/
 D: CMI8330 support is sb_card.c
 D: ISAPnP fixes in sb_card.c
+D: ZyXEL omni.net lcd plus driver
+D: RTC subsystem
 S: Italy
 N: Marc Zyngier
author	Dmitry Torokhov <dtor_core@ameritech.net>	2006-04-02 00:08:05 -0500
committer	Dmitry Torokhov <dtor_core@ameritech.net>	2006-04-02 00:08:05 -0500
commit	95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch)
tree	65c38b2f11c51bb6932e44dd6c92f15b0091abfe /CREDITS
parent	642fde17dceceb56c7ba2762733ac688666ae657 (diff)
parent	683aa4012f53b2ada0f430487e05d37b0d94e90a (diff)

diff --git a/CREDITS b/CREDITS index 64511e2abc8e..0bf31eac6dc2 100644 --- a/CREDITS +++ b/CREDITS
@@ -120,7 +120,6 @@ D: Author of lil (Linux Interrupt Latency benchmark)
120	D: Fixed the shm swap deallocation at swapoff time (try_to_unuse message)	120	D: Fixed the shm swap deallocation at swapoff time (try_to_unuse message)
121	D: VM hacker	121	D: VM hacker
122	D: Various other kernel hacks	122	D: Various other kernel hacks
123	S: Via Cicalini 26
124	S: Imola 40026	123	S: Imola 40026
125	S: Italy	124	S: Italy
126		125
@@ -1128,8 +1127,10 @@ S: Carnegie, Pennsylvania 15106-4304
1128	S: USA	1127	S: USA
1129		1128
1130	N: Philip Gladstone	1129	N: Philip Gladstone
1131	E: philip@raptor.com	1130	E: philip@gladstonefamily.net
1132	D: Kernel / timekeeping stuff	1131	D: Kernel / timekeeping stuff
		1132	S: Carlisle, MA 01741
		1133	S: USA
1133		1134
1134	N: Jan-Benedict Glaw	1135	N: Jan-Benedict Glaw
1135	E: jbglaw@lug-owl.de	1136	E: jbglaw@lug-owl.de
@@ -2008,13 +2009,14 @@ S: University of Stuttgart, Germany and
2008	S: Ecole Nationale Superieure des Telecommunications, Paris	2009	S: Ecole Nationale Superieure des Telecommunications, Paris
2009		2010
2010	N: Jamie Lokier	2011	N: Jamie Lokier
2011	E: jamie@imbolc.ucc.ie	2012	E: jamie@shareable.org
		2013	W: http://www.shareable.org/
2012	D: Reboot-through-BIOS for broken 486 motherboards	2014	D: Reboot-through-BIOS for broken 486 motherboards
2013	D: Some parport fixes	2015	D: Parport fixes, futex improvements
2014	S: 11 Goodson Walk	2016	D: First instruction of x86 sysenter path :)
2015	S: Marston	2017	S: 51 Sunningwell Road
2016	S: Oxford	2018	S: Oxford
2017	S: OX3 0HX	2019	S: OX1 4SZ
2018	S: United Kingdom	2020	S: United Kingdom
2019		2021
2020	N: Mark Lord	2022	N: Mark Lord
@@ -2814,6 +2816,8 @@ E: luca.risolia@studio.unibo.it
2814	P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958 5D40 99DA 5D2A FCE6 35A4	2816	P: 1024D/FCE635A4 88E8 F32F 7244 68BA 3958 5D40 99DA 5D2A FCE6 35A4
2815	D: V4L driver for W996[87]CF JPEG USB Dual Mode Camera Chips	2817	D: V4L driver for W996[87]CF JPEG USB Dual Mode Camera Chips
2816	D: V4L2 driver for SN9C10x PC Camera Controllers	2818	D: V4L2 driver for SN9C10x PC Camera Controllers
		2819	D: V4L2 driver for ET61X151 and ET61X251 PC Camera Controllers
		2820	D: V4L2 driver for ZC0301 Image Processor and Control Chip
2817	S: Via Liberta' 41/A	2821	S: Via Liberta' 41/A
2818	S: Osio Sotto, 24046, Bergamo	2822	S: Osio Sotto, 24046, Bergamo
2819	S: Italy	2823	S: Italy
@@ -3739,10 +3743,11 @@ D: Mylex DAC960 PCI RAID driver
3739	D: Miscellaneous kernel fixes	3743	D: Miscellaneous kernel fixes
3740		3744
3741	N: Alessandro Zummo	3745	N: Alessandro Zummo
3742	E: azummo@ita.flashnet.it	3746	E: a.zummo@towertech.it
3743	W: http://freepage.logicom.it/azummo/
3744	D: CMI8330 support is sb_card.c	3747	D: CMI8330 support is sb_card.c
3745	D: ISAPnP fixes in sb_card.c	3748	D: ISAPnP fixes in sb_card.c
		3749	D: ZyXEL omni.net lcd plus driver
		3750	D: RTC subsystem
3746	S: Italy	3751	S: Italy
3747		3752
3748	N: Marc Zyngier	3753	N: Marc Zyngier