黄涛 84aa38e58d Merge remote branch 'linux-2.6.32.y/master' into develop ...

Conflicts:
	drivers/net/wireless/orinoco/main.c
	drivers/net/wireless/orinoco/wext.c
	drivers/net/wireless/p54/p54usb.c

2011-02-13 10:25:30 +08:00

..

integrity/ima

ima: fix add LSM rule bug

2011-01-07 14:43:17 -08: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

seq_file: constify seq_operations

2009-09-23 07:39:29 -07:00

tomoyo

KEYS: Add a keyctl to install a process's session keyring on its parent [try #6]

2009-09-02 21:29:22 +10:00

capability.c

LSM/SELinux: inode_{get,set,notify}secctx hooks to access LSM security context information.

2009-09-10 10:11:24 +10:00

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

Merge commit 'v2.6.31-rc8' into x86/txt

2009-09-02 08:17:56 +02:00

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

rootplug: Remove redundant initialization.

2009-05-27 13:30:46 +10:00

security.c

LSM/SELinux: inode_{get,set,notify}secctx hooks to access LSM security context information.

2009-09-10 10:11:24 +10:00