diff options
author | Nicolas Pitre <nico@fluxnic.net> | 2009-09-14 09:25:28 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-15 18:37:12 +0200 |
commit | 2f82af08fcc7dc01a7e98a49a5995a77e32a2925 (patch) | |
tree | d505fe5936881b137b82b59360646a6988e506ba /MAINTAINERS | |
parent | Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/l... (diff) | |
download | linux-2f82af08fcc7dc01a7e98a49a5995a77e32a2925.tar.xz linux-2f82af08fcc7dc01a7e98a49a5995a77e32a2925.zip |
Nicolas Pitre has a new email address
Due to problems at cam.org, my nico@cam.org email address is no longer
valid. FRom now on, nico@fluxnic.net should be used instead.
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 837b5985ac40..64b9e447545c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3317,7 +3317,7 @@ S: Supported F: drivers/net/wireless/mwl8k.c MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER -M: Nicolas Pitre <nico@cam.org> +M: Nicolas Pitre <nico@fluxnic.net> S: Maintained MARVELL YUKON / SYSKONNECT DRIVER @@ -4689,7 +4689,7 @@ F: include/linux/sl?b*.h F: mm/sl?b.c SMC91x ETHERNET DRIVER -M: Nicolas Pitre <nico@cam.org> +M: Nicolas Pitre <nico@fluxnic.net> S: Maintained F: drivers/net/smc91x.* |