projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[firefly-linux-kernel-4.4.55.git]
/
CREDITS
diff --git
a/CREDITS
b/CREDITS
index a347520bef2d63c1cd80dbf3cdd01d8f4184f26b..192f749eba25b38007b7a32e362e06896f7a368c 100644
(file)
--- a/
CREDITS
+++ b/
CREDITS
@@
-1097,7
+1097,7
@@
S: 80050-430 - Curitiba - Paran
S: Brazil
N: Kumar Gala
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
D: Embedded PowerPC 6xx/7xx/74xx/82xx/83xx/85xx support
S: Austin, Texas 78729
S: USA
@@
-2247,6
+2247,12
@@
S: 249 Nichols Avenue
S: Syracuse, New York 13206
S: USA
S: Syracuse, New York 13206
S: USA
+N: Kyle McMartin
+E: kyle@parisc-linux.org
+D: Linux/PARISC hacker
+D: AD1889 sound driver
+S: Ottawa, Canada
+
N: Dirk Melchers
E: dirk@merlin.nbg.sub.org
D: 8 bit XT hard disk driver for OMTI5520
N: Dirk Melchers
E: dirk@merlin.nbg.sub.org
D: 8 bit XT hard disk driver for OMTI5520
@@
-3636,11
+3642,9
@@
S: Beaverton, OR 97005
S: USA
N: Michal Wronski
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)
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
S: Poland
N: Frank Xia