David S. Miller 04f58c8854 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	Documentation/devicetree/bindings/net/micrel-ks8851.txt
	net/core/netpoll.c

The net/core/netpoll.c conflict is a bug fix in 'net' happening
to code which is completely removed in 'net-next'.

In micrel-ks8851.txt we simply have overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2014-03-25 20:29:20 -04:00

..

audit.h

SELinux: keep the code clean formating and syntax

2008-07-14 15:01:36 +10:00

avc_ss.h

selinux: sparse fix: fix several warnings in the security server code

2011-09-09 16:56:32 -07:00

avc.h

selinux: remove 'flags' parameter from avc_audit()

2013-10-04 14:13:25 -07:00

classmap.h

selinux: add the "attach_queue" permission to the "tun_socket" class

2013-01-14 18:16:59 -05:00

conditional.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

initial_sid_to_string.h

selinux: const strings in tables

2010-03-08 09:33:53 +11:00

netif.h

doc: Update the email address for Paul Moore in various source files

2011-08-01 17:58:33 -07:00

netlabel.h

doc: Update the email address for Paul Moore in various source files

2011-08-01 17:58:33 -07:00

netnode.h

doc: Update the email address for Paul Moore in various source files

2011-08-01 17:58:33 -07:00

netport.h

doc: Update the email address for Paul Moore in various source files

2011-08-01 17:58:33 -07:00

objsec.h

SELinux: Fix possible NULL pointer dereference in selinux_inode_permission()

2014-01-12 16:53:13 +07:00

security.h

selinux: add gfp argument to security_xfrm_policy_alloc and fix callers

2014-03-10 08:30:02 +01:00

xfrm.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-03-25 20:29:20 -04:00