diff options
author | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 00:18:25 -0500 |
---|---|---|
committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 00:18:25 -0500 |
commit | a9931a6e37c09f6b76a9fa0cbd777c335548692b (patch) | |
tree | cd6ba9d36e350dd6188f7b8f95efc59c85d34485 /CREDITS | |
parent | 7301c8d3a05dc52d33598364da7c4eb6ab6357eb (diff) | |
parent | 811803c5572b296e0031e0099203de90d77c7bcf (diff) |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'CREDITS')
-rw-r--r-- | CREDITS | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -1097,7 +1097,7 @@ S: 80050-430 - Curitiba - Paraná S: Brazil N: Kumar Gala -E: kumar.gala@freescale.com +E: galak@kernel.crashing.org D: Embedded PowerPC 6xx/7xx/74xx/82xx/83xx/85xx support S: Austin, Texas 78729 S: USA @@ -3642,11 +3642,9 @@ S: Beaverton, OR 97005 S: USA N: Michal Wronski -E: wrona@mat.uni.torun.pl -W: http://www.mat.uni.torun.pl/~wrona +E: Michal.Wronski@motorola.com D: POSIX message queues fs (with K. Benedyczak) -S: ul. Teczowa 23/12 -S: 80-680 Gdansk-Sobieszewo +S: Krakow S: Poland N: Frank Xia |