aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-11-07 19:14:20 -0500
committerPaul Mackerras <paulus@samba.org>2005-11-07 19:14:20 -0500
commit24bfb00123e82a2e70bd115277d922438813515b (patch)
tree27328b8a5718e16d64e2d101f4b7ddcad5930aed /CREDITS
parentc6135234550ed89a6fd0e8cb229633967e41d649 (diff)
parent3f00d3e8fb963968a922d821a9a53b503b687e81 (diff)
Merge ../linux-2.6
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS6
1 files changed, 2 insertions, 4 deletions
diff --git a/CREDITS b/CREDITS
index 5b1edf3a38..7fb4c73e02 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3642,11 +3642,9 @@ S: Beaverton, OR 97005
3642S: USA 3642S: USA
3643 3643
3644N: Michal Wronski 3644N: Michal Wronski
3645E: wrona@mat.uni.torun.pl 3645E: Michal.Wronski@motorola.com
3646W: http://www.mat.uni.torun.pl/~wrona
3647D: POSIX message queues fs (with K. Benedyczak) 3646D: POSIX message queues fs (with K. Benedyczak)
3648S: ul. Teczowa 23/12 3647S: Krakow
3649S: 80-680 Gdansk-Sobieszewo
3650S: Poland 3648S: Poland
3651 3649
3652N: Frank Xia 3650N: Frank Xia