diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 12:01:32 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 12:01:32 -0500 |
commit | 5b2f7ffcb734d3046144dfbd5ac6d76254a9e522 (patch) | |
tree | 8290f03bcd6af331d7a401282028acfeea37d1de /CREDITS | |
parent | 333c47c847c90aaefde8b593054d9344106333b5 (diff) | |
parent | b7c4a9f83f3c0f6f2a2750a389a9b758c3d9e9d2 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'CREDITS')
-rw-r--r-- | CREDITS | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -3642,11 +3642,9 @@ S: Beaverton, OR 97005 | |||
3642 | S: USA | 3642 | S: USA |
3643 | 3643 | ||
3644 | N: Michal Wronski | 3644 | N: Michal Wronski |
3645 | E: wrona@mat.uni.torun.pl | 3645 | E: Michal.Wronski@motorola.com |
3646 | W: http://www.mat.uni.torun.pl/~wrona | ||
3647 | D: POSIX message queues fs (with K. Benedyczak) | 3646 | D: POSIX message queues fs (with K. Benedyczak) |
3648 | S: ul. Teczowa 23/12 | 3647 | S: Krakow |
3649 | S: 80-680 Gdansk-Sobieszewo | ||
3650 | S: Poland | 3648 | S: Poland |
3651 | 3649 | ||
3652 | N: Frank Xia | 3650 | N: Frank Xia |