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

[sfrench/cifs-2.6.git] / arch / arm / mach-sa1100 / include / mach / system.h

diff --git a/arch/arm/mach-sa1100/include/mach/system.h b/arch/arm/mach-sa1100/include/mach/system.h
index 942b153e251d601ffb9fc79a87a5a07fba9bb761..ba9da9f7f1837cc0a94667ad3e0377dbba762237 100644 (file)
--- a/arch/arm/mach-sa1100/include/mach/system.h
+++ b/arch/arm/mach-sa1100/include/mach/system.h
@@ -1,7 +1,7 @@
 /*
  * arch/arm/mach-sa1100/include/mach/system.h
  *
- * Copyright (c) 1999 Nicolas Pitre <nico@cam.org>
+ * Copyright (c) 1999 Nicolas Pitre <nico@fluxnic.net>
  */
 #include <mach/hardware.h>