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 c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/usb/qmi_wwan.c include/net/dst.h Trivial merge conflicts, both were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>		11 years ago
..
apparmor	apparmor: fix bad lock balance when introspecting policy	11 years ago
integrity	xattr: Constify ->name member of "struct xattr".	12 years ago
keys	aio: don't include aio.h in sched.h	12 years ago
selinux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	11 years ago
smack	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	12 years ago
tomoyo	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	12 years ago
yama	yama: Better permission check for ptraceme	12 years ago
Kconfig	KEYS: Move the key config into security/keys/Kconfig	13 years ago
Makefile	security: Yama LSM	13 years ago
capability.c	xattr: Constify ->name member of "struct xattr".	12 years ago
commoncap.c	capabilities: allow nice if we are privileged	12 years ago
device_cgroup.c	cgroup: make css_for_each_descendant() and friends include the origin css in the iteration	12 years ago
inode.c	securityfs: fix object creation races	13 years ago
lsm_audit.c	net: fix build errors if ipv6 is disabled	11 years ago
min_addr.c	…
security.c	xattr: Constify ->name member of "struct xattr".	12 years ago