diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-07-18 13:50:22 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-07-18 13:50:40 (GMT) |
| commit | 5304d5fc74a269cc6c3e70f9713684ca729abdf0 (patch) | |
| tree | 6a5db62915abd260241a2b9aee34086c93293ca6 /kernel/power/user.c | |
| parent | 54d35f29f49224d86b994acb6e5969b9ba09022d (diff) | |
| parent | 78af08d90b8f745044b1274430bc4bc6b2b27aca (diff) | |
| download | linux-fsl-qoriq-5304d5fc74a269cc6c3e70f9713684ca729abdf0.tar.xz | |
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 'kernel/power/user.c')
| -rw-r--r-- | kernel/power/user.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/power/user.c b/kernel/power/user.c index ed97375..bf0014d 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c @@ -23,7 +23,6 @@ #include <linux/console.h> #include <linux/cpu.h> #include <linux/freezer.h> -#include <linux/smp_lock.h> #include <scsi/scsi_scan.h> #include <asm/uaccess.h> |