aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-01-22 04:03:02 -0500
committerThomas Gleixner <tglx@linutronix.de>2009-01-22 04:03:02 -0500
commit6552ebae25ffd57574c6e72d17fce67fea08b918 (patch)
treecde6cc932c7e47d818154b011dfd8a6997d5c18e /CREDITS
parent749a440b2218e9937dca8c68e23e51ca4d8d37fe (diff)
parent336f6c322d87806ef93afad6308ac65083a865e5 (diff)
Merge branch 'core/debugobjects' into core/urgent
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS11
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
3786 3786
3787N: David Woodhouse 3787N: David Woodhouse
3788E: dwmw2@infradead.org 3788E: dwmw2@infradead.org
3789D: ARCnet stuff, Applicom board driver, SO_BINDTODEVICE, 3789D: JFFS2 file system, Memory Technology Device subsystem,
3790D: some Alpha platform porting from 2.0, Memory Technology Devices,
3791D: Acquire watchdog timer, PC speaker driver maintenance,
3792D: various other stuff that annoyed me by not working. 3790D: various other stuff that annoyed me by not working.
3793S: c/o Red Hat Engineering 3791S: c/o Intel Corporation
3794S: Rustat House 3792S: Pipers Way
3795S: 60 Clifton Road 3793S: Swindon. SN3 1RJ
3796S: Cambridge. CB1 7EG
3797S: England 3794S: England
3798 3795
3799N: Chris Wright 3796N: Chris Wright