diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-18 09:50:22 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-07-18 09:50:40 -0400 |
| commit | 5304d5fc74a269cc6c3e70f9713684ca729abdf0 (patch) | |
| tree | 6a5db62915abd260241a2b9aee34086c93293ca6 /arch/mn10300/kernel/ptrace.c | |
| parent | 54d35f29f49224d86b994acb6e5969b9ba09022d (diff) | |
| parent | 78af08d90b8f745044b1274430bc4bc6b2b27aca (diff) | |
Merge branch 'linus' into sched/core
Merge reason: branch had an old upstream base (-rc1-ish), but also
merge to avoid a conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mn10300/kernel/ptrace.c')
| -rw-r--r-- | arch/mn10300/kernel/ptrace.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/ptrace.c b/arch/mn10300/kernel/ptrace.c index e143339ad28e..cf847dabc1bd 100644 --- a/arch/mn10300/kernel/ptrace.c +++ b/arch/mn10300/kernel/ptrace.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 14 | #include <linux/mm.h> | 14 | #include <linux/mm.h> |
| 15 | #include <linux/smp.h> | 15 | #include <linux/smp.h> |
| 16 | #include <linux/smp_lock.h> | ||
| 17 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
| 18 | #include <linux/ptrace.h> | 17 | #include <linux/ptrace.h> |
| 19 | #include <linux/user.h> | 18 | #include <linux/user.h> |