diff options
author | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:47:38 -0400 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2011-03-28 06:47:38 -0400 |
commit | 72ed73c3f0801e860ee27e53ab6aaf47941ba324 (patch) | |
tree | b46c546d77ee8931d47dafc97bf23b11472bffeb /include/asm-generic/user.h | |
parent | 883ae7992c09435927dda642b61f1455fceb5b85 (diff) | |
parent | bd1573a5546b4351b5d042f1e4cd631ea67cc6b0 (diff) |
Merge branch 'x86-platform-next' into x86-platform
Diffstat (limited to 'include/asm-generic/user.h')
-rw-r--r-- | include/asm-generic/user.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-generic/user.h b/include/asm-generic/user.h index 8b9c3c960ae..35638c34700 100644 --- a/include/asm-generic/user.h +++ b/include/asm-generic/user.h @@ -1,8 +1,8 @@ #ifndef __ASM_GENERIC_USER_H #define __ASM_GENERIC_USER_H /* - * This file may define a 'struct user' structure. However, it it only - * used for a.out file, which are not supported on new architectures. + * This file may define a 'struct user' structure. However, it is only + * used for a.out files, which are not supported on new architectures. */ #endif /* __ASM_GENERIC_USER_H */ |