aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc/string.h
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-05-23 02:53:23 -0400
committerPaul Mackerras <paulus@samba.org>2008-05-23 02:53:23 -0400
commitacf464817d5e7be9fb67aec4027dbee0ac9be17a (patch)
tree39fd061c0a91a11d3ae4ff19b7fe179325e39bbf /include/asm-sparc/string.h
parent80d267f9aee6f1b5df602b5a19fb7b4923f17db2 (diff)
parent8962cadbe7cbc4ed0fff94f56ebab505a10afd2e (diff)
Merge branch 'merge' into powerpc-next
Diffstat (limited to 'include/asm-sparc/string.h')
-rw-r--r--include/asm-sparc/string.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/string.h b/include/asm-sparc/string.h
index cb1e923356c6..8d7c0dd4f299 100644
--- a/include/asm-sparc/string.h
+++ b/include/asm-sparc/string.h
@@ -1,4 +1,4 @@
1/* $Id: string.h,v 1.36 2001/12/21 00:54:31 davem Exp $ 1/*
2 * string.h: External definitions for optimized assembly string 2 * string.h: External definitions for optimized assembly string
3 * routines for the Linux Kernel. 3 * routines for the Linux Kernel.
4 * 4 *