summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c24xx/s3c2440-pll-12000000.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-05 11:35:33 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-05 11:35:33 +0100
commit0719dc341389882cc834ed18fc9b7fc6006b2b85 (patch)
tree794480ac62c07ea8cc4e69c2cb3d2b83bb7f36b7 /arch/arm/plat-s3c24xx/s3c2440-pll-12000000.c
parentMerge branches 'at91', 'ep93xx', 'etm', 'ks8695', 'nuc', 'u300' and 'u8500' i... (diff)
parentMerge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into dev... (diff)
downloadlinux-0719dc341389882cc834ed18fc9b7fc6006b2b85.tar.xz
linux-0719dc341389882cc834ed18fc9b7fc6006b2b85.zip
Merge branch 'devel-stable' into devel
Diffstat (limited to 'arch/arm/plat-s3c24xx/s3c2440-pll-12000000.c')
-rw-r--r--arch/arm/plat-s3c24xx/s3c2440-pll-12000000.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/s3c2440-pll-12000000.c b/arch/arm/plat-s3c24xx/s3c2440-pll-12000000.c
index ff9443b233aa..49f65032f2c0 100644
--- a/arch/arm/plat-s3c24xx/s3c2440-pll-12000000.c
+++ b/arch/arm/plat-s3c24xx/s3c2440-pll-12000000.c
@@ -1,6 +1,6 @@
/* arch/arm/plat-s3c24xx/s3c2440-pll-12000000.c
*
- * Copyright (c) 2006,2007 Simtec Electronics
+ * Copyright (c) 2006-2007 Simtec Electronics
* http://armlinux.simtec.co.uk/
* Ben Dooks <ben@simtec.co.uk>
* Vincent Sanders <vince@arm.linux.org.uk>