diff options
author | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 16:31:20 -0500 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-12-03 16:31:20 -0500 |
commit | 3d4db84cee590dbf5b5fa49d8bcd9e1c60f2a4b5 (patch) | |
tree | 7372a6f8ed5f4adb8c6829447aaea2872d0e61f6 /arch/arm/mach-s3c2440/mach-rx3715.c | |
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-s3c2440/mach-rx3715.c')
-rw-r--r-- | arch/arm/mach-s3c2440/mach-rx3715.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c index bc8d8d1ebd1a..e394ecd01510 100644 --- a/arch/arm/mach-s3c2440/mach-rx3715.c +++ b/arch/arm/mach-s3c2440/mach-rx3715.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* linux/arch/arm/mach-s3c2440/mach-rx3715.c | 1 | /* linux/arch/arm/mach-s3c2440/mach-rx3715.c |
2 | * | 2 | * |
3 | * Copyright (c) 2003,2004 Simtec Electronics | 3 | * Copyright (c) 2003-2004 Simtec Electronics |
4 | * Ben Dooks <ben@simtec.co.uk> | 4 | * Ben Dooks <ben@simtec.co.uk> |
5 | * | 5 | * |
6 | * http://www.handhelds.org/projects/rx3715.html | 6 | * http://www.handhelds.org/projects/rx3715.html |