git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
[pandora-kernel.git]
/
CREDITS
diff --git
a/CREDITS
b/CREDITS
index
5d75254
..
ccd4f9f
100644
(file)
--- a/
CREDITS
+++ b/
CREDITS
@@
-45,7
+45,7
@@
S: Longford, Ireland
S: Sydney, Australia
N: Tigran A. Aivazian
S: Sydney, Australia
N: Tigran A. Aivazian
-E: tigran@
veritas.com
+E: tigran@
aivazian.fsnet.co.uk
W: http://www.moses.uklinux.net/patches
D: BFS filesystem
D: Intel IA32 CPU microcode update support
W: http://www.moses.uklinux.net/patches
D: BFS filesystem
D: Intel IA32 CPU microcode update support
@@
-3511,14
+3511,12
@@
D: The Linux Support Team Erlangen
N: David Weinehall
E: tao@acc.umu.se
N: David Weinehall
E: tao@acc.umu.se
+P: 1024D/DC47CA16 7ACE 0FB0 7A74 F994 9B36 E1D1 D14E 8526 DC47 CA16
W: http://www.acc.umu.se/~tao/
W: http://www.acc.umu.se/~tao/
-W: http://www.acc.umu.se/~mcalinux/
+D: v2.0 kernel maintainer
D: Fixes for the NE/2-driver
D: Miscellaneous MCA-support
D: Cleanup of the Config-files
D: Fixes for the NE/2-driver
D: Miscellaneous MCA-support
D: Cleanup of the Config-files
-S: Axtorpsvagen 40:20
-S: S-903 37 UMEA
-S: Sweden
N: Matt Welsh
E: mdw@metalab.unc.edu
N: Matt Welsh
E: mdw@metalab.unc.edu
@@
-3578,11
+3576,11
@@
S: Fargo, North Dakota 58122
S: USA
N: Steven Whitehouse
S: USA
N: Steven Whitehouse
-E:
SteveW@ACM.org
+E:
steve@chygwyn.com
W: http://www.chygwyn.com/~steve
W: http://www.chygwyn.com/~steve
-D: Linux DECnet project
: http://www.sucs.swan.ac.uk/~rohan/DECnet/index.html
+D: Linux DECnet project
D: Minor debugging of other networking protocols.
D: Minor debugging of other networking protocols.
-D: Misc bug fixes and filesystem development
+D: Misc bug fixes and
GFS2
filesystem development
N: Hans-Joachim Widmaier
E: hjw@zvw.de
N: Hans-Joachim Widmaier
E: hjw@zvw.de