Linus Torvalds e7691a1ce3 Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security ... * 'for-linus' of git://selinuxproject.org/~jmorris/linux-security: (32 commits) ima: fix invalid memory reference ima: free duplicate measurement memory security: update security_file_mmap() docs selinux: Casting (void *) value returned by kmalloc is useless apparmor: fix module parameter handling Security: tomoyo: add .gitignore file tomoyo: add missing rcu_dereference() apparmor: add missing rcu_dereference() evm: prevent racing during tfm allocation evm: key must be set once during initialization mpi/mpi-mpow: NULL dereference on allocation failure digsig: build dependency fix KEYS: Give key types their own lockdep class for key->sem TPM: fix transmit_cmd error logic TPM: NSC and TIS drivers X86 dependency fix TPM: Export wait_for_stat for other vendor specific drivers TPM: Use vendor specific function for status probe tpm_tis: add delay after aborting command tpm_tis: Check return code from getting timeouts/durations tpm: Introduce function to poll for result of self test ... Fix up trivial conflict in lib/Makefile due to addition of CONFIG_MPI and SIGSIG next to CONFIG_DQL addition.		2012-01-10 21:51:23 -08:00
..
apparmor	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-10 21:51:23 -08:00
integrity	Merge branch 'next' into for-linus	2012-01-09 12:16:48 +11:00
keys	Merge branch 'next' into for-linus	2012-01-09 12:16:48 +11:00
selinux	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-10 21:51:23 -08:00
smack	vfs: prefer ->dentry->d_sb to ->mnt->mnt_sb	2012-01-06 23:16:53 -05:00
tomoyo	Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security	2012-01-10 21:51:23 -08:00
capability.c	switch security_path_chmod() to struct path *	2012-01-06 23:16:53 -05:00
commoncap.c	capabilities: initialize has_cap	2011-08-16 09:20:45 +10:00
device_cgroup.c	cgroup: introduce cgroup_taskset and use it in subsys->can_attach(), cancel_attach() and attach()	2011-12-12 18:12:21 -08:00
inode.c	securityfs: fix object creation races	2012-01-10 10:20:35 -05:00
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	switch security_path_chmod() to struct path *	2012-01-06 23:16:53 -05:00