David S. Miller abb434cb05 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: net/bluetooth/l2cap_core.c Just two overlapping changes, one added an initialization of a local variable, and another change added a new local variable. Signed-off-by: David S. Miller <davem@davemloft.net>		2011-12-23 17:13:56 -05:00
..
apparmor	fix apparmor dereferencing potentially freed dentry, sanitize __d_path() API	2011-12-06 23:57:18 -05:00
integrity	evm: prevent racing during tfm allocation	2011-12-20 17:50:08 +02:00
keys	encrypted-keys: module build fixes	2011-11-16 14:23:14 -05:00
selinux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2011-12-23 17:13:56 -05:00
smack	Smack: smackfs cipso seq read repair	2011-11-11 11:07:21 -08:00
tomoyo	TOMOYO: Fix pathname handling of disconnected paths.	2011-12-08 13:18:12 -08:00
capability.c	->permission() sanitizing: don't pass flags to ->inode_permission()	2011-07-20 01:43:26 -04:00
commoncap.c	capabilities: initialize has_cap	2011-08-16 09:20:45 +10:00
device_cgroup.c	security,rcu: Convert call_rcu(whitelist_item_free) to kfree_rcu()	2011-07-20 11:05:30 -07:00
inode.c
Kconfig	encrypted-keys: remove trusted-keys dependency	2011-09-14 15:23:49 -04:00
lsm_audit.c	ipv6: Add fragment reporting to ipv6_skip_exthdr().	2011-12-03 09:35:10 -08:00
Makefile	integrity: move ima inode integrity data management	2011-07-18 12:29:38 -04:00
min_addr.c
security.c	Merge branch 'next' of git://selinuxproject.org/~jmorris/linux-security	2011-10-25 09:45:31 +02:00