git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[sfrench/cifs-2.6.git]
/
security
/
capability.c
diff --git
a/security/capability.c
b/security/capability.c
index b868e7eda5f06fafa49ed73c21cf1d5332a77e40..38296a0054653f9180bd554f167e077bb311a35a 100644
(file)
--- a/
security/capability.c
+++ b/
security/capability.c
@@
-17,7
+17,6
@@
#include <linux/mman.h>
#include <linux/pagemap.h>
#include <linux/swap.h>
-#include <linux/smp_lock.h>
#include <linux/skbuff.h>
#include <linux/netlink.h>
#include <linux/ptrace.h>