diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 08:47:57 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 08:47:57 -0400 |
| commit | 40d743b8c16a8cf6e30c1d941aa6147f9550ea75 (patch) | |
| tree | 9fcdf9a06b18a275253048d1ea7c9803cec38845 /arch/arm/lib | |
| parent | 7da18afa423f167e7ef3c9728e584d8bf05bd55a (diff) | |
| parent | 83e686ea0291ee93b87dcdc00b96443b80de56c9 (diff) | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6
Diffstat (limited to 'arch/arm/lib')
| -rw-r--r-- | arch/arm/lib/lib1funcs.S | 2 | ||||
| -rw-r--r-- | arch/arm/lib/sha1.S | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/lib1funcs.S b/arch/arm/lib/lib1funcs.S index 67964bcfc854..6dc06487f3c3 100644 --- a/arch/arm/lib/lib1funcs.S +++ b/arch/arm/lib/lib1funcs.S | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * linux/arch/arm/lib/lib1funcs.S: Optimized ARM division routines | 2 | * linux/arch/arm/lib/lib1funcs.S: Optimized ARM division routines |
| 3 | * | 3 | * |
| 4 | * Author: Nicolas Pitre <nico@cam.org> | 4 | * Author: Nicolas Pitre <nico@fluxnic.net> |
| 5 | * - contributed to gcc-3.4 on Sep 30, 2003 | 5 | * - contributed to gcc-3.4 on Sep 30, 2003 |
| 6 | * - adapted for the Linux kernel on Oct 2, 2003 | 6 | * - adapted for the Linux kernel on Oct 2, 2003 |
| 7 | */ | 7 | */ |
diff --git a/arch/arm/lib/sha1.S b/arch/arm/lib/sha1.S index 09b548cac1a4..eb0edb80d7b8 100644 --- a/arch/arm/lib/sha1.S +++ b/arch/arm/lib/sha1.S | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | * | 3 | * |
| 4 | * SHA transform optimized for ARM | 4 | * SHA transform optimized for ARM |
| 5 | * | 5 | * |
| 6 | * Copyright: (C) 2005 by Nicolas Pitre <nico@cam.org> | 6 | * Copyright: (C) 2005 by Nicolas Pitre <nico@fluxnic.net> |
| 7 | * Created: September 17, 2005 | 7 | * Created: September 17, 2005 |
| 8 | * | 8 | * |
| 9 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |