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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
MAINTAINERS
diff --git
a/MAINTAINERS
b/MAINTAINERS
index
11944b4
..
0652ab3
100644
(file)
--- a/
MAINTAINERS
+++ b/
MAINTAINERS
@@
-3533,7
+3533,7
@@
S: Supported
S390 NETWORK DRIVERS
P: Ursula Braun
S390 NETWORK DRIVERS
P: Ursula Braun
-M: u
braun@linux.vnet
.ibm.com
+M: u
rsula.braun@de
.ibm.com
P: Frank Blaschka
M: blaschka@linux.vnet.ibm.com
M: linux390@de.ibm.com
P: Frank Blaschka
M: blaschka@linux.vnet.ibm.com
M: linux390@de.ibm.com
@@
-3553,7
+3553,7
@@
S: Supported
S390 IUCV NETWORK LAYER
P: Ursula Braun
S390 IUCV NETWORK LAYER
P: Ursula Braun
-M: u
braun@linux.vnet
.ibm.com
+M: u
rsula.braun@de
.ibm.com
M: linux390@de.ibm.com
L: linux-s390@vger.kernel.org
W: http://www.ibm.com/developerworks/linux/linux390/
M: linux390@de.ibm.com
L: linux-s390@vger.kernel.org
W: http://www.ibm.com/developerworks/linux/linux390/