diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-12-23 02:41:14 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-12-23 02:41:14 -0500 |
| commit | cfb13c5db08c90311a5defdde9a0328ee788cca5 (patch) | |
| tree | 842cb60d1d19b99e550fdbc653723e4b13e51ee5 /arch/um/kernel/exec.c | |
| parent | 4b6ba8aacbb3185703b797286547d0f8f3859b02 (diff) | |
| parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
Merge commit 'v2.6.37-rc7' into devicetree/next
Diffstat (limited to 'arch/um/kernel/exec.c')
| -rw-r--r-- | arch/um/kernel/exec.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c index 340268be00b5..09bd7b585726 100644 --- a/arch/um/kernel/exec.c +++ b/arch/um/kernel/exec.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | 5 | ||
| 6 | #include "linux/stddef.h" | 6 | #include "linux/stddef.h" |
| 7 | #include "linux/fs.h" | 7 | #include "linux/fs.h" |
| 8 | #include "linux/smp_lock.h" | ||
| 9 | #include "linux/ptrace.h" | 8 | #include "linux/ptrace.h" |
| 10 | #include "linux/sched.h" | 9 | #include "linux/sched.h" |
| 11 | #include "linux/slab.h" | 10 | #include "linux/slab.h" |