You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		11 years ago
..
include	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	11 years ago
ss	selinux: add gfp argument to security_xfrm_policy_alloc and fix callers	11 years ago
.gitignore	…
Kconfig	…
Makefile	…
avc.c	selinux: remove 'flags' parameter from avc_audit()	12 years ago
exports.c	…
hooks.c	selinux: add gfp argument to security_xfrm_policy_alloc and fix callers	11 years ago
netif.c	net: pass info struct via netdevice notifier	12 years ago
netlabel.c	selinux: ensure that the cached NetLabel secattr matches the desired SID	11 years ago
netlink.c	selinux: replace obsolete NLMSG_* with type safe nlmsg_*	12 years ago
netnode.c	selinux: fix problems in netnode when BUG() is compiled out	12 years ago
netport.c	…
nlmsgtab.c	selinux: add SOCK_DIAG_BY_FAMILY to the list of netlink message types	11 years ago
selinuxfs.c	selinux: add gfp argument to security_xfrm_policy_alloc and fix callers	11 years ago
xfrm.c	selinux: add gfp argument to security_xfrm_policy_alloc and fix callers	11 years ago