diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 08:51:36 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 08:51:36 +0000 |
| commit | e624ae8e0d4243e71daedce7570e91290438eaca (patch) | |
| tree | e2b9804379a6aab3d2471898d257fe5590feb70c /arch/um/kernel/exec.c | |
| parent | c4a1d9e4dc5d5313cfec2cc0c9d630efe8a6f287 (diff) | |
| parent | 4ab0fbd3a29067e1540f05093ae4ed07645d18c8 (diff) | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
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 @@ #include "linux/stddef.h" #include "linux/fs.h" -#include "linux/smp_lock.h" #include "linux/ptrace.h" #include "linux/sched.h" #include "linux/slab.h" |