diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-22 20:54:47 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-22 20:54:47 -0400 |
| commit | 7cf75262a4aafe1483349e897bf905e121314dff (patch) | |
| tree | 9a11d432ff3add3204c4bc5a01b6d12c4df7e9d9 /MAINTAINERS | |
| parent | c8f15686a4b3345e3e81e09cfe191df58bbedd45 (diff) | |
| parent | b0e453902ad53580a77c2b1baddcc0b2d8ce8acc (diff) | |
Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ec0c9c914f17..8c44572c1721 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3527,7 +3527,7 @@ S: Supported | |||
| 3527 | 3527 | ||
| 3528 | S390 NETWORK DRIVERS | 3528 | S390 NETWORK DRIVERS |
| 3529 | P: Ursula Braun | 3529 | P: Ursula Braun |
| 3530 | M: ubraun@linux.vnet.ibm.com | 3530 | M: ursula.braun@de.ibm.com |
| 3531 | P: Frank Blaschka | 3531 | P: Frank Blaschka |
| 3532 | M: blaschka@linux.vnet.ibm.com | 3532 | M: blaschka@linux.vnet.ibm.com |
| 3533 | M: linux390@de.ibm.com | 3533 | M: linux390@de.ibm.com |
| @@ -3547,7 +3547,7 @@ S: Supported | |||
| 3547 | 3547 | ||
| 3548 | S390 IUCV NETWORK LAYER | 3548 | S390 IUCV NETWORK LAYER |
| 3549 | P: Ursula Braun | 3549 | P: Ursula Braun |
| 3550 | M: ubraun@linux.vnet.ibm.com | 3550 | M: ursula.braun@de.ibm.com |
| 3551 | M: linux390@de.ibm.com | 3551 | M: linux390@de.ibm.com |
| 3552 | L: linux-s390@vger.kernel.org | 3552 | L: linux-s390@vger.kernel.org |
| 3553 | W: http://www.ibm.com/developerworks/linux/linux390/ | 3553 | W: http://www.ibm.com/developerworks/linux/linux390/ |