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>

2013-10-23 16:49:34 -04:00

..

apparmor

apparmor: fix bad lock balance when introspecting policy

2013-10-16 11:54:01 +11:00

integrity

xattr: Constify ->name member of "struct xattr".

2013-07-25 19:30:03 +10:00

keys

aio: don't include aio.h in sched.h

2013-05-07 20:16:25 -07:00

selinux

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

2013-10-23 16:49:34 -04:00

smack

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

2013-09-07 14:34:07 -07:00

tomoyo

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2013-05-01 17:51:54 -07:00

yama

yama: Better permission check for ptraceme

2013-03-26 13:17:58 -07:00

capability.c

xattr: Constify ->name member of "struct xattr".

2013-07-25 19:30:03 +10:00

commoncap.c

capabilities: allow nice if we are privileged

2013-08-30 23:44:09 -07:00

device_cgroup.c

cgroup: make css_for_each_descendant() and friends include the origin css in the iteration

2013-08-08 20:11:27 -04:00

inode.c

securityfs: fix object creation races

2012-01-10 10:20:35 -05:00

Kconfig

KEYS: Move the key config into security/keys/Kconfig

2012-05-11 10:56:56 +01:00

lsm_audit.c

net: fix build errors if ipv6 is disabled

2013-10-09 13:04:03 -04:00

Makefile

security: Yama LSM

2012-02-10 09:18:52 +11:00

min_addr.c

mmap_min_addr check CAP_SYS_RAWIO only for write

2010-04-23 08:56:31 +10:00

security.c

xattr: Constify ->name member of "struct xattr".

2013-07-25 19:30:03 +10:00