summaryrefslogtreecommitdiffstats
path: root/CREDITS
diff options
context:
space:
mode:
authorNicolas Pitre <nico@fluxnic.net>2009-09-14 09:25:28 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-15 18:37:12 +0200
commit2f82af08fcc7dc01a7e98a49a5995a77e32a2925 (patch)
treed505fe5936881b137b82b59360646a6988e506ba /CREDITS
parentMerge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/l... (diff)
downloadlinux-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 'CREDITS')
-rw-r--r--CREDITS2
1 files changed, 1 insertions, 1 deletions
diff --git a/CREDITS b/CREDITS
index 1a41bf4addd0..72b487869788 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2800,7 +2800,7 @@ D: Starter of Linux1394 effort
S: ask per mail for current address
N: Nicolas Pitre
-E: nico@cam.org
+E: nico@fluxnic.net
D: StrongARM SA1100 support integrator & hacker
D: Xscale PXA architecture
D: unified SMC 91C9x/91C11x ethernet driver (smc91x)