Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[karo-tx-linux.git] / arch / arm / mach-sa1100 / pm.c

diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c
index 111cce67ad2fa8f33d97a4101ce70d44d3d880e5..c83fdc80edfd1226c8ddea56b700e047f099d218 100644 (file)
--- a/arch/arm/mach-sa1100/pm.c
+++ b/arch/arm/mach-sa1100/pm.c
@@ -15,7 +15,7 @@
  *                     Save more value for the resume function! Support
  *                     Bitsy/Assabet/Freebird board
  *
- * 2001-08-29: Nicolas Pitre <nico@cam.org>
+ * 2001-08-29: Nicolas Pitre <nico@fluxnic.net>
  *                     Cleaned up, pushed platform dependent stuff
  *                     in the platform specific files.
  *