diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 20:33:54 +0300 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 20:33:54 +0300 |
commit | 602fd7c36728a04e61a442c9755e7d454501266c (patch) | |
tree | 6be77464bd07934a40959d68e5d08d75829bdc49 /arch/arm/plat-s3c/include/plat/cpu-freq.h | |
parent | d7931d9f7ab9de9158c6905caae979999134ad4d (diff) | |
parent | 88d27041cf4d36e499e2c54b6c44d9115ccf124a (diff) | |
download | linux-602fd7c36728a04e61a442c9755e7d454501266c.tar.xz |
Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/plat-s3c/include/plat/cpu-freq.h')
-rw-r--r-- | arch/arm/plat-s3c/include/plat/cpu-freq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/include/plat/cpu-freq.h b/arch/arm/plat-s3c/include/plat/cpu-freq.h index 7b982b7f28cd..94eb06a2ea5c 100644 --- a/arch/arm/plat-s3c/include/plat/cpu-freq.h +++ b/arch/arm/plat-s3c/include/plat/cpu-freq.h @@ -1,6 +1,6 @@ /* arch/arm/plat-s3c/include/plat/cpu-freq.h * - * Copyright (c) 2006,2007 Simtec Electronics + * Copyright (c) 2006-2007 Simtec Electronics * http://armlinux.simtec.co.uk/ * Ben Dooks <ben@simtec.co.uk> * |