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/osiris-map.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/osiris-map.h')
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/osiris-map.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/osiris-map.h b/arch/arm/mach-s3c2410/include/mach/osiris-map.h index 639eff523d4..17380f84842 100644 --- a/arch/arm/mach-s3c2410/include/mach/osiris-map.h +++ b/arch/arm/mach-s3c2410/include/mach/osiris-map.h @@ -1,6 +1,6 @@ /* arch/arm/mach-s3c2410/include/mach/osiris-map.h * - * (c) 2005 Simtec Electronics + * Copyright 2005 Simtec Electronics * http://www.simtec.co.uk/products/ * Ben Dooks <ben@simtec.co.uk> * |