Merge branch 'for-davem' into for-next

2015-04-11 22:27:19 -04:00
parent fdc81f45e9 01e97e6517
commit 39c853ebfe
1537 changed files with 47887 additions and 28928 deletions
--- a/security/security.c
+++ b/security/security.c
@@ -1359,11 +1359,6 @@ int security_tun_dev_open(void *security)
 }
 EXPORT_SYMBOL(security_tun_dev_open);

-void security_skb_owned_by(struct sk_buff *skb, struct sock *sk)
-{
-	security_ops->skb_owned_by(skb, sk);
-}
-
 #endif	/* CONFIG_SECURITY_NETWORK */

 #ifdef CONFIG_SECURITY_NETWORK_XFRM