summaryrefslogtreecommitdiffstats
path: root/arch/alpha/lib/csum_partial_copy.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2007-10-20 04:26:44 +0000
committerSteve French <sfrench@us.ibm.com>2007-10-20 04:26:44 +0000
commit748c5151deb56e4b7b5a9b07a884243764933831 (patch)
treee9dd45b8806d00b56503cfa55c46f3ebce0d151c /arch/alpha/lib/csum_partial_copy.c
parent4879b44829d94a1f8facf90cced3c5f23c5a8c62 (diff)
parente8b8c977734193adedf2b0f607d6252c78e86394 (diff)
downloadtalos-obmc-linux-748c5151deb56e4b7b5a9b07a884243764933831.tar.gz
talos-obmc-linux-748c5151deb56e4b7b5a9b07a884243764933831.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/alpha/lib/csum_partial_copy.c')
-rw-r--r--arch/alpha/lib/csum_partial_copy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/lib/csum_partial_copy.c b/arch/alpha/lib/csum_partial_copy.c
index 4ca75c74ce90..40736da9bea8 100644
--- a/arch/alpha/lib/csum_partial_copy.c
+++ b/arch/alpha/lib/csum_partial_copy.c
@@ -2,7 +2,7 @@
* csum_partial_copy - do IP checksumming and copy
*
* (C) Copyright 1996 Linus Torvalds
- * accellerated versions (and 21264 assembly versions ) contributed by
+ * accelerated versions (and 21264 assembly versions ) contributed by
* Rick Gorton <rick.gorton@alpha-processor.com>
*
* Don't look at this too closely - you'll go mad. The things
OpenPOWER on IntegriCloud