1 files changed, 4 insertions, 7 deletions
diff --git a/CREDITS b/CREDITS
index 939da46a87fb..2b39168c06aa 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3786,14 +3786,11 @@ S: The Netherlands
 N: David Woodhouse
 E: dwmw2@infradead.org
-D: ARCnet stuff, Applicom board driver, SO_BINDTODEVICE,
+D: JFFS2 file system, Memory Technology Device subsystem,
-D: some Alpha platform porting from 2.0, Memory Technology Devices,
-D: Acquire watchdog timer, PC speaker driver maintenance,
 D: various other stuff that annoyed me by not working.
-S: c/o Red Hat Engineering
+S: c/o Intel Corporation
-S: Rustat House
+S: Pipers Way
-S: 60 Clifton Road
+S: Swindon. SN3 1RJ
-S: Cambridge. CB1 7EG
 S: England
 N: Chris Wright

diff --git a/CREDITS b/CREDITS index 939da46a87fb..2b39168c06aa 100644 --- a/CREDITS +++ b/CREDITS
@@ -3786,14 +3786,11 @@ S: The Netherlands
3786		3786
3787	N: David Woodhouse	3787	N: David Woodhouse
3788	E: dwmw2@infradead.org	3788	E: dwmw2@infradead.org
3789	D: ARCnet stuff, Applicom board driver, SO_BINDTODEVICE,	3789	D: JFFS2 file system, Memory Technology Device subsystem,
3790	D: some Alpha platform porting from 2.0, Memory Technology Devices,
3791	D: Acquire watchdog timer, PC speaker driver maintenance,
3792	D: various other stuff that annoyed me by not working.	3790	D: various other stuff that annoyed me by not working.
3793	S: c/o Red Hat Engineering	3791	S: c/o Intel Corporation
3794	S: Rustat House	3792	S: Pipers Way
3795	S: 60 Clifton Road	3793	S: Swindon. SN3 1RJ
3796	S: Cambridge. CB1 7EG
3797	S: England	3794	S: England
3798		3795
3799	N: Chris Wright	3796	N: Chris Wright