diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-11-26 09:03:27 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-11-26 09:05:21 -0500 |
| commit | 22a867d81707b0a2720bb5f65255265b95d30526 (patch) | |
| tree | 7ec19b155b50b13ae95244c2bfa16aea4920c4f6 /arch/m68knommu/kernel | |
| parent | 5bb6b1ea67a73f0665a41726dd7138977b992c6c (diff) | |
| parent | 3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff) | |
Merge commit 'v2.6.37-rc3' into sched/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/m68knommu/kernel')
| -rw-r--r-- | arch/m68knommu/kernel/process.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68knommu/kernel/process.c b/arch/m68knommu/kernel/process.c index 6d3390590e5b..e2a63af5d517 100644 --- a/arch/m68knommu/kernel/process.c +++ b/arch/m68knommu/kernel/process.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | #include <linux/mm.h> | 20 | #include <linux/mm.h> |
| 21 | #include <linux/smp.h> | 21 | #include <linux/smp.h> |
| 22 | #include <linux/smp_lock.h> | ||
| 23 | #include <linux/stddef.h> | 22 | #include <linux/stddef.h> |
| 24 | #include <linux/unistd.h> | 23 | #include <linux/unistd.h> |
| 25 | #include <linux/ptrace.h> | 24 | #include <linux/ptrace.h> |