diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/asm-generic/user.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
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 8b9c3c960aeb..35638c34700f 100644 --- a/include/asm-generic/user.h +++ b/include/asm-generic/user.h | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | #ifndef __ASM_GENERIC_USER_H | 1 | #ifndef __ASM_GENERIC_USER_H |
| 2 | #define __ASM_GENERIC_USER_H | 2 | #define __ASM_GENERIC_USER_H |
| 3 | /* | 3 | /* |
| 4 | * This file may define a 'struct user' structure. However, it it only | 4 | * This file may define a 'struct user' structure. However, it is only |
| 5 | * used for a.out file, which are not supported on new architectures. | 5 | * used for a.out files, which are not supported on new architectures. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #endif /* __ASM_GENERIC_USER_H */ | 8 | #endif /* __ASM_GENERIC_USER_H */ |