diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 14:47:57 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-19 14:47:57 +0200 |
commit | 40d743b8c16a8cf6e30c1d941aa6147f9550ea75 (patch) | |
tree | 9fcdf9a06b18a275253048d1ea7c9803cec38845 /arch/arm/mm | |
parent | ARM: s3c: fix check of index into s3c_gpios[] (diff) | |
parent | Thumb-2: Correctly handle undefined instructions in the kernel (diff) | |
download | linux-40d743b8c16a8cf6e30c1d941aa6147f9550ea75.tar.xz linux-40d743b8c16a8cf6e30c1d941aa6147f9550ea75.zip |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6
Diffstat (limited to 'arch/arm/mm')
-rw-r--r-- | arch/arm/mm/proc-xscale.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S index 0cce37b93937..423394260bcb 100644 --- a/arch/arm/mm/proc-xscale.S +++ b/arch/arm/mm/proc-xscale.S @@ -17,7 +17,7 @@ * * 2001 Sep 08: * Completely revisited, many important fixes - * Nicolas Pitre <nico@cam.org> + * Nicolas Pitre <nico@fluxnic.net> */ #include <linux/linkage.h> |