From: James Morris <jmorris@namei.org>
Date: Tue, 8 Mar 2011 00:38:10 +0000 (+1100)
Subject: Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
X-Git-Tag: v2.6.39-rc7~20^2^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fe3fa43039d47ee4e22caf460b79b62a14937f79;p=platform%2Fkernel%2Flinux-3.10.git

Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
---

fe3fa43039d47ee4e22caf460b79b62a14937f79
diff --cc include/linux/security.h
index b2b7f97,d11ac43..84a202a
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@@ -1662,10 -1665,9 +1665,9 @@@ int security_capset(struct cred *new, c
  		    const kernel_cap_t *effective,
  		    const kernel_cap_t *inheritable,
  		    const kernel_cap_t *permitted);
 -int security_capable(int cap);
 +int security_capable(const struct cred *cred, int cap);
  int security_real_capable(struct task_struct *tsk, int cap);
  int security_real_capable_noaudit(struct task_struct *tsk, int cap);
- int security_sysctl(struct ctl_table *table, int op);
  int security_quotactl(int cmds, int type, int id, struct super_block *sb);
  int security_quota_on(struct dentry *dentry);
  int security_syslog(int type);