diff options
author | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 21:31:20 +0000 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 21:31:20 +0000 |
commit | 3d4db84cee590dbf5b5fa49d8bcd9e1c60f2a4b5 (patch) | |
tree | 7372a6f8ed5f4adb8c6829447aaea2872d0e61f6 /arch/arm/mach-s3c2410/include/mach/bast-pmu.h | |
parent | 0c31862880c4f8d4a36d3a208e76d45066aeeb88 (diff) | |
parent | ccae941ee2de58b9391f4e166b1bad33fcbfc119 (diff) |
ARM: Merge next-s3c24xx-simtec
Merge branch 'next-s3c24xx-simtec' into for-rmk
Diffstat (limited to 'arch/arm/mach-s3c2410/include/mach/bast-pmu.h')
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/bast-pmu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/bast-pmu.h b/arch/arm/mach-s3c2410/include/mach/bast-pmu.h index 61684cb8ce5..4c38b39b741 100644 --- a/arch/arm/mach-s3c2410/include/mach/bast-pmu.h +++ b/arch/arm/mach-s3c2410/include/mach/bast-pmu.h @@ -1,6 +1,6 @@ /* arch/arm/mach-s3c2410/include/mach/bast-pmu.h * - * Copyright (c) 2003,2004 Simtec Electronics + * Copyright (c) 2003-2004 Simtec Electronics * Ben Dooks <ben@simtec.co.uk> * Vincent Sanders <vince@simtec.co.uk> * |