diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
| commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
| tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /arch/m32r/lib/strlen.S | |
| parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'arch/m32r/lib/strlen.S')
| -rw-r--r-- | arch/m32r/lib/strlen.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m32r/lib/strlen.S b/arch/m32r/lib/strlen.S index 5f41aacd7b3e..916de9e8f801 100644 --- a/arch/m32r/lib/strlen.S +++ b/arch/m32r/lib/strlen.S | |||
| @@ -6,8 +6,6 @@ | |||
| 6 | * size_t strlen(const char *s); | 6 | * size_t strlen(const char *s); |
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | /* $Id$ */ | ||
| 10 | |||
| 11 | 9 | ||
| 12 | #include <linux/linkage.h> | 10 | #include <linux/linkage.h> |
| 13 | #include <asm/assembler.h> | 11 | #include <asm/assembler.h> |