Merge commit 'v3.17' into next

This commit is contained in:
James Morris
2014-11-19 21:32:12 +11:00
10177 changed files with 437869 additions and 456249 deletions

View File

@@ -275,7 +275,7 @@ static struct notifier_block sel_netif_netdev_notifier = {
static __init int sel_netif_init(void)
{
int i, err;
int i;
if (!selinux_enabled)
return 0;
@@ -285,7 +285,7 @@ static __init int sel_netif_init(void)
register_netdevice_notifier(&sel_netif_netdev_notifier);
return err;
return 0;
}
__initcall(sel_netif_init);