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 branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
CREDITS
diff --git
a/CREDITS
b/CREDITS
index
ee909f2
..
da0a56e
100644
(file)
--- a/
CREDITS
+++ b/
CREDITS
@@
-508,12
+508,8
@@
D: REINER SCT cyberJack pinpad/e-com USB chipcard reader driver
S: Germany
N: Adrian Bunk
S: Germany
N: Adrian Bunk
-E: bunk@stusta.de
P: 1024D/4F12B400 B29C E71E FE19 6755 5C8A 84D4 99FC EA98 4F12 B400
D: misc kernel hacking and testing
P: 1024D/4F12B400 B29C E71E FE19 6755 5C8A 84D4 99FC EA98 4F12 B400
D: misc kernel hacking and testing
-S: Grasmeierstrasse 11
-S: 80805 Muenchen
-S: Germany
N: Ray Burr
E: ryb@nightmare.com
N: Ray Burr
E: ryb@nightmare.com
@@
-1124,6
+1120,9
@@
S: 1150 Ringwood Court
S: San Jose, California 95131
S: USA
S: San Jose, California 95131
S: USA
+N: Adam Fritzler
+E: mid@zigamorph.net
+
N: Fernando Fuganti
E: fuganti@conectiva.com.br
E: fuganti@netbank.com.br
N: Fernando Fuganti
E: fuganti@conectiva.com.br
E: fuganti@netbank.com.br
@@
-1353,6
+1352,14
@@
S: Gen Stedmanstraat 212
S: 5623 HZ Eindhoven
S: The Netherlands
S: 5623 HZ Eindhoven
S: The Netherlands
+N: Oliver Hartkopp
+E: oliver.hartkopp@volkswagen.de
+W: http://www.volkswagen.de
+D: Controller Area Network (network layer core)
+S: Brieffach 1776
+S: 38436 Wolfsburg
+S: Germany
+
N: Andrew Haylett
E: ajh@primag.co.uk
D: Selection mechanism
N: Andrew Haylett
E: ajh@primag.co.uk
D: Selection mechanism
@@
-3306,6
+3313,14
@@
S: Universit=E9 de Rennes I
S: F-35042 Rennes Cedex
S: France
S: F-35042 Rennes Cedex
S: France
+N: Urs Thuermann
+E: urs.thuermann@volkswagen.de
+W: http://www.volkswagen.de
+D: Controller Area Network (network layer core)
+S: Brieffach 1776
+S: 38436 Wolfsburg
+S: Germany
+
N: Jon Tombs
E: jon@gte.esi.us.es
W: http://www.esi.us.es/~jon
N: Jon Tombs
E: jon@gte.esi.us.es
W: http://www.esi.us.es/~jon