summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c24xx/s3c2412-iotiming.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-12-13 16:35:09 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-12-13 16:35:09 +0000
commitbc7ecbcbc2c0ff235382077b55de7896775afc16 (patch)
tree9918b2f3fdeebd9c99a308af94d86bc13c80d0c8 /arch/arm/plat-s3c24xx/s3c2412-iotiming.c
parentc52854018ad123c9ef83867462457b75bb56d452 (diff)
parent285eae0a4ba0f467341476fd4c6981e5cdafc6be (diff)
downloadblackbird-op-linux-bc7ecbcbc2c0ff235382077b55de7896775afc16.tar.gz
blackbird-op-linux-bc7ecbcbc2c0ff235382077b55de7896775afc16.zip
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/plat-s3c24xx/s3c2412-iotiming.c')
-rw-r--r--arch/arm/plat-s3c24xx/s3c2412-iotiming.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c24xx/s3c2412-iotiming.c b/arch/arm/plat-s3c24xx/s3c2412-iotiming.c
index fd45e47facbc..24993dce10b5 100644
--- a/arch/arm/plat-s3c24xx/s3c2412-iotiming.c
+++ b/arch/arm/plat-s3c24xx/s3c2412-iotiming.c
@@ -1,6 +1,6 @@
/* linux/arch/arm/plat-s3c24xx/s3c2412-iotiming.c
*
- * Copyright (c) 2006,2008 Simtec Electronics
+ * Copyright (c) 2006-2008 Simtec Electronics
* http://armlinux.simtec.co.uk/
* Ben Dooks <ben@simtec.co.uk>
*
OpenPOWER on IntegriCloud