aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2400
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2009-12-03 21:31:20 +0000
committerBen Dooks <ben-linux@fluff.org>2009-12-03 21:31:20 +0000
commit3d4db84cee590dbf5b5fa49d8bcd9e1c60f2a4b5 (patch)
tree7372a6f8ed5f4adb8c6829447aaea2872d0e61f6 /arch/arm/mach-s3c2400
parent0c31862880c4f8d4a36d3a208e76d45066aeeb88 (diff)
parentccae941ee2de58b9391f4e166b1bad33fcbfc119 (diff)
ARM: Merge next-s3c24xx-simtec
Merge branch 'next-s3c24xx-simtec' into for-rmk
Diffstat (limited to 'arch/arm/mach-s3c2400')
-rw-r--r--arch/arm/mach-s3c2400/include/mach/map.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2400/include/mach/map.h b/arch/arm/mach-s3c2400/include/mach/map.h
index 1535540edc8..3fd889200e9 100644
--- a/arch/arm/mach-s3c2400/include/mach/map.h
+++ b/arch/arm/mach-s3c2400/include/mach/map.h
@@ -1,6 +1,6 @@
/* arch/arm/mach-s3c2400/include/mach/map.h
*
- * Copyright 2003,2007 Simtec Electronics
+ * Copyright 2003-2007 Simtec Electronics
* http://armlinux.simtec.co.uk/
* Ben Dooks <ben@simtec.co.uk>
*