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

Conflicts:
	net/mac80211/sta_info.c
	net/wireless/core.h

Two minor conflicts in wireless.  Overlapping additions of extern
declarations in net/wireless/core.h and a bug fix overlapping with
the addition of a boolean parameter to __ieee80211_key_free().

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

2013-04-01 13:36:50 -04:00

..

apparmor

new helper: file_inode(file)

2013-02-22 23:31:31 -05:00

integrity

hlist: drop the node parameter from iterators

2013-02-27 19:10:24 -08:00

keys

Fix: compat_rw_copy_check_uvector() misuse in aio, readv, writev, and security keys

2013-03-12 11:05:45 -07:00

selinux

selinux: replace obsolete NLMSG_* with type safe nlmsg_*

2013-03-28 14:25:49 -04:00

smack

new helper: file_inode(file)

2013-02-22 23:31:31 -05:00

tomoyo

new helper: file_inode(file)

2013-02-22 23:31:31 -05:00

yama

yama: Better permission check for ptraceme

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

capability.c

tun: fix LSM/SELinux labeling of tun/tap devices

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

commoncap.c

kill f_vfsmnt

2013-02-26 02:46:10 -05:00

device_cgroup.c

device_cgroup: don't grab mutex in rcu callback

2013-02-21 17:22:15 -08: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

LSM: BUILD_BUG_ON if the common_audit_data union ever grows

2012-04-09 12:23:03 -04:00

Makefile

security: Yama LSM

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

min_addr.c

…

security.c

tun: fix LSM/SELinux labeling of tun/tap devices

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