Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ... Conflicts: MAINTAINERS arch/arm/mach-omap2/pm24xx.c drivers/scsi/bfa/bfa_fcpim.c Needed to update to apply fixes for which the old branch was too outdated.		2010-12-22 18:57:02 +01:00
..
apparmor	Merge branch 'master' into for-next	2010-12-22 18:57:02 +01:00
integrity/ima	IMA: fix the ToMToU logic	2010-10-26 11:37:19 -07:00
keys	Fix install_process_keyring error handling	2010-10-28 09:02:15 -07:00
selinux	capabilities/syslog: open code cap_syslog logic to fix build failure	2010-11-15 15:40:01 -08:00
smack	capabilities/syslog: open code cap_syslog logic to fix build failure	2010-11-15 15:40:01 -08:00
tomoyo	fs: take dcache_lock inside __d_path	2010-10-25 21:26:12 -04:00
capability.c	capabilities/syslog: open code cap_syslog logic to fix build failure	2010-11-15 15:40:01 -08:00
commoncap.c	capabilities/syslog: open code cap_syslog logic to fix build failure	2010-11-15 15:40:01 -08:00
device_cgroup.c	Merge branch 'master' into next	2010-05-06 10:56:07 +10:00
inode.c	convert get_sb_single() users	2010-10-29 04:16:28 -04:00
Kconfig	Restrict unprivileged access to kernel syslog	2010-11-12 07:55:32 -08:00
lsm_audit.c	Merge branch 'master' into next	2010-05-06 10:56:07 +10:00
Makefile	AppArmor: Enable configuring and building of the AppArmor security module	2010-08-02 15:38:34 +10:00
min_addr.c	mmap_min_addr check CAP_SYS_RAWIO only for write	2010-04-23 08:56:31 +10:00
security.c	capabilities/syslog: open code cap_syslog logic to fix build failure	2010-11-15 15:40:01 -08:00