Jens Axboe 0b7877d4ee Merge tag 'v3.4-rc5' into for-3.5/core ...

The core branch is behind driver commits that we want to build
on for 3.5, hence I'm pulling in a later -rc.

Linux 3.4-rc5

Conflicts:
	Documentation/feature-removal-schedule.txt

Signed-off-by: Jens Axboe <axboe@kernel.dk>

2012-05-01 14:29:55 +02:00

..

apparmor

lsm_audit: don't specify the audit pre/post callbacks in 'struct common_audit_data'

2012-04-03 09:49:59 -07:00

integrity

security: fix ima kconfig warning

2012-02-28 11:01:15 +11:00

keys

usermodehelper: kill umh_wait, renumber UMH_* constants

2012-03-23 16:58:41 -07:00

selinux

lsm_audit: don't specify the audit pre/post callbacks in 'struct common_audit_data'

2012-04-03 09:49:59 -07:00

smack

Smack: move label list initialization

2012-04-18 12:02:28 +10:00

tomoyo

usermodehelper: use UMH_WAIT_PROC consistently

2012-03-23 16:58:41 -07:00

yama

Yama: add PR_SET_PTRACER_ANY

2012-02-16 10:25:18 +11:00

capability.c

security: create task_free security callback

2012-02-10 09:14:51 +11:00

commoncap.c

security: fix compile error in commoncap.c

2012-04-19 12:56:39 +10:00

device_cgroup.c

cgroup: convert all non-memcg controllers to the new cftype interface

2012-04-01 12:09:55 -07:00

inode.c

securityfs: fix object creation races

2012-01-10 10:20:35 -05:00

Kconfig

security: Yama LSM

2012-02-10 09:18:52 +11:00

lsm_audit.c

lsm_audit: don't specify the audit pre/post callbacks in 'struct common_audit_data'

2012-04-03 09:49:59 -07:00

Makefile

security: Yama LSM

2012-02-10 09:18:52 +11: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: trim security.h

2012-02-14 10:45:42 +11:00