diff options
author | Ben Dooks <ben-linux@fluff.org> | 2009-12-04 00:31:20 +0300 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-12-04 00:31:20 +0300 |
commit | 3d4db84cee590dbf5b5fa49d8bcd9e1c60f2a4b5 (patch) | |
tree | 7372a6f8ed5f4adb8c6829447aaea2872d0e61f6 /arch/arm/plat-s3c24xx/s3c2412-iotiming.c | |
parent | 0c31862880c4f8d4a36d3a208e76d45066aeeb88 (diff) | |
parent | ccae941ee2de58b9391f4e166b1bad33fcbfc119 (diff) | |
download | linux-3d4db84cee590dbf5b5fa49d8bcd9e1c60f2a4b5.tar.xz |
ARM: Merge next-s3c24xx-simtec
Merge branch 'next-s3c24xx-simtec' into for-rmk
Diffstat (limited to 'arch/arm/plat-s3c24xx/s3c2412-iotiming.c')
-rw-r--r-- | arch/arm/plat-s3c24xx/s3c2412-iotiming.c | 2 |
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> * |