summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
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 /arch/arm/boot
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 'arch/arm/boot')
-rw-r--r--arch/arm/boot/compressed/head-sa1100.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/head-sa1100.S b/arch/arm/boot/compressed/head-sa1100.S
index 4c8c0e46027d..6179d94dd5c6 100644
--- a/arch/arm/boot/compressed/head-sa1100.S
+++ b/arch/arm/boot/compressed/head-sa1100.S
@@ -1,7 +1,7 @@
/*
* linux/arch/arm/boot/compressed/head-sa1100.S
*
- * Copyright (C) 1999 Nicolas Pitre <nico@cam.org>
+ * Copyright (C) 1999 Nicolas Pitre <nico@fluxnic.net>
*
* SA1100 specific tweaks. This is merged into head.S by the linker.
*