git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'turbostat' and 'x86_energy_perf_policy' into tools
[pandora-kernel.git]
/
fs
/
locks.c
diff --git
a/fs/locks.c
b/fs/locks.c
index
0e62dd3
..
8729347
100644
(file)
--- a/
fs/locks.c
+++ b/
fs/locks.c
@@
-122,7
+122,6
@@
#include <linux/module.h>
#include <linux/security.h>
#include <linux/slab.h>
-#include <linux/smp_lock.h>
#include <linux/syscalls.h>
#include <linux/time.h>
#include <linux/rcupdate.h>