diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-13 09:47:07 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-13 09:47:07 -0700 |
commit | 7775c9753b94fe429dc4323360d6502c95e0dd6e (patch) | |
tree | 5e89c5d2186e52591eb1945213ccb812e0411d5d /MAINTAINERS | |
parent | fa8d84b78be10d0c455dd716f40152bb7003bd5b (diff) | |
parent | 42a5a8a60a093c359987fd884aec99b9d7f4c084 (diff) | |
download | linux-3.10-7775c9753b94fe429dc4323360d6502c95e0dd6e.tar.gz linux-3.10-7775c9753b94fe429dc4323360d6502c95e0dd6e.tar.bz2 linux-3.10-7775c9753b94fe429dc4323360d6502c95e0dd6e.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: update my email address
parisc: fix miscompilation of ip_fast_csum with gcc >= 4.3
parisc: fix off by one in setup_sigcontext32
parisc: export empty_zero_page
parisc: export copy_user_page_asm
parisc: move head.S to head.text section
Revert "parisc: fix trivial section name warnings"
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index a536396a4af..cd587eec9fa 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -274,7 +274,7 @@ S: Maintained AD1889 ALSA SOUND DRIVER P: Kyle McMartin -M: kyle@parisc-linux.org +M: kyle@mcmartin.ca P: Thibaut Varene M: T-Bone@parisc-linux.org W: http://wiki.parisc-linux.org/AD1889 @@ -1828,7 +1828,7 @@ S: Maintained HARMONY SOUND DRIVER P: Kyle McMartin -M: kyle@parisc-linux.org +M: kyle@mcmartin.ca L: linux-parisc@vger.kernel.org S: Maintained @@ -3121,7 +3121,7 @@ S: Maintained PARISC ARCHITECTURE P: Kyle McMartin -M: kyle@parisc-linux.org +M: kyle@mcmartin.ca P: Matthew Wilcox M: matthew@wil.cx P: Grant Grundler @@ -4026,7 +4026,7 @@ TULIP NETWORK DRIVERS P: Grant Grundler M: grundler@parisc-linux.org P: Kyle McMartin -M: kyle@parisc-linux.org +M: kyle@mcmartin.ca L: netdev@vger.kernel.org S: Maintained |