aboutsummaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 12:01:32 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 12:01:32 -0500
commit5b2f7ffcb734d3046144dfbd5ac6d76254a9e522 (patch)
tree8290f03bcd6af331d7a401282028acfeea37d1de /CREDITS
parent333c47c847c90aaefde8b593054d9344106333b5 (diff)
parentb7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'CREDITS')
-rw-r--r--CREDITS6
1 files changed, 2 insertions, 4 deletions
diff --git a/CREDITS b/CREDITS
index 5b1edf3a38a..7fb4c73e022 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