黄涛 a2ad9f9801 Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb ... Conflicts: drivers/net/usb/asix.c drivers/net/wireless/iwlwifi/iwl-agn-rs.c drivers/usb/serial/option.c		2012-07-12 18:46:41 +08:00
..
apparmor	fix apparmor dereferencing potentially freed dentry, sanitize __d_path() API	2011-12-21 12:57:36 -08:00
integrity/ima	ima: fix invalid memory reference	2012-01-25 17:24:41 -08:00
keys	KEYS: Fix a NULL pointer deref in the user-defined key type	2011-11-21 14:31:18 -08:00
selinux	SELinux: if sel_make_bools errors don't leave inconsistent state	2012-06-01 15:12:54 +08:00
smack	Merge commit 'v2.6.39' into 20110526	2011-05-26 17:20:14 -04:00
tomoyo	TOMOYO: Fix mount flags checking order.	2012-04-13 08:14:08 -07:00
capability.c	SECURITY: Move exec_permission RCU checks into security modules	2011-04-25 10:20:32 -04:00
commoncap.c	Merge remote-tracking branch 'common/android-3.0' into develop-3.0-jb	2012-07-12 18:08:01 +08:00
device_cgroup.c	devcgroup_inode_permission: take "is it a device node" checks to inlined wrapper	2011-06-20 10:46:04 -04:00
inode.c	convert get_sb_single() users	2010-10-29 04:16:28 -04:00
Kconfig	security: select correct default LSM_MMAP_MIN_ADDR on ARM.	2011-03-22 09:35:12 +11:00
lsm_audit.c	LSM: separate LSM_AUDIT_DATA_DENTRY from LSM_AUDIT_DATA_PATH	2011-04-25 18:14:07 -04: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	SECURITY: Move exec_permission RCU checks into security modules	2011-04-25 10:20:32 -04:00