黄涛 6e2688ca84 Merge remote branch 'linux-2.6.32.y/master' into develop ... Conflicts: drivers/i2c/busses/Kconfig drivers/net/dm9000.c drivers/net/wireless/libertas/if_sdio1.c drivers/usb/serial/option.c net/bluetooth/rfcomm/core.c		2010-12-16 20:54:24 +08:00
..
integrity/ima	ima: replace GFP_KERNEL with GFP_NOFS	2009-11-19 08:42:01 +11:00
keys	KEYS: Fix bug in keyctl_session_to_parent() if parent has no session keyring	2010-09-26 17:21:30 -07:00
selinux	netlabel: fix export of SELinux categories > 127	2010-03-15 08:49:34 -07:00
smack
tomoyo
capability.c
commoncap.c	security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable().	2010-02-08 15:35:52 -08: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	security: testing the wrong variable in create_by_name()	2010-05-12 14:57:14 -07:00
Kconfig
lsm_audit.c	lsm: Use a compressed IPv6 string format in audit events	2009-09-24 03:50:26 -04:00
Makefile	NOMMU: Optimise away the {dac_,}mmap_min_addr tests	2010-01-06 15:04:30 -08:00
min_addr.c	mmap_min_addr check CAP_SYS_RAWIO only for write	2010-05-26 14:29:21 -07:00
root_plug.c
security.c