David S. Miller 28b4d5cc17 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ...

Conflicts:
	drivers/net/pcmcia/fmvj18x_cs.c
	drivers/net/pcmcia/nmclan_cs.c
	drivers/net/pcmcia/xirc2ps_cs.c
	drivers/net/wireless/ray_cs.c

2009-12-05 15:22:26 -08:00

..

integrity/ima

Merge branch 'master' into next

2009-12-03 12:03:40 +05:30

keys

KEYS: get_instantiation_keyring() should inc the keyring refcount in all cases

2009-10-15 15:19:58 -07:00

selinux

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-12-05 15:22:26 -08:00

smack

net: rename skb->iif to skb->skb_iif

2009-11-20 15:35:04 -08:00

tomoyo

TOMOYO: Add recursive directory matching operator support.

2009-11-25 18:51:16 +11:00

capability.c

security: report the module name to security_module_request

2009-11-10 09:33:46 +11:00

commoncap.c

remove CONFIG_SECURITY_FILE_CAPABILITIES compile option

2009-11-24 15:06:47 +11:00

device_cgroup.c

cgroups: let ss->can_attach and ss->attach do whole threadgroups at a time

2009-09-24 07:20:58 -07:00

inode.c

securityfs: securityfs_remove should handle IS_ERR pointers

2009-05-12 11:06:11 +10:00

Kconfig

remove CONFIG_SECURITY_FILE_CAPABILITIES compile option

2009-11-24 15:06:47 +11:00

lsm_audit.c

Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

2009-12-05 15:22:26 -08:00

Makefile

security: remove root_plug

2009-10-20 14:26:16 +09:00

min_addr.c

sysctl: require CAP_SYS_RAWIO to set mmap_min_addr

2009-11-09 08:34:22 +11:00

security.c

security: report the module name to security_module_request

2009-11-10 09:33:46 +11:00