diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 01:15:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 01:15:13 -0400 |
| commit | c101f3136cc98a003d0d16be6fab7d0d950581a6 (patch) | |
| tree | 738f3ea3ff68245fb0900aeeeb73f1accb2bf956 /MAINTAINERS | |
| parent | 359ea2f1352a77177540a213283bc7489f546ced (diff) | |
| parent | e3e01d6005ab4b0877f1fb3efef7f5b745e743be (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 19a9a1c53037..302b31960008 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -2161,7 +2161,7 @@ UltraSPARC (sparc64): | |||
| 2161 | P: David S. Miller | 2161 | P: David S. Miller |
| 2162 | M: davem@davemloft.net | 2162 | M: davem@davemloft.net |
| 2163 | P: Eddie C. Dost | 2163 | P: Eddie C. Dost |
| 2164 | M: ecd@skynet.be | 2164 | M: ecd@brainaid.de |
| 2165 | P: Jakub Jelinek | 2165 | P: Jakub Jelinek |
| 2166 | M: jj@sunsite.ms.mff.cuni.cz | 2166 | M: jj@sunsite.ms.mff.cuni.cz |
| 2167 | P: Anton Blanchard | 2167 | P: Anton Blanchard |