Colin Cross 633c6f1b21 Merge commit 'v3.4.5' into android-3.4 ... Conflicts: drivers/base/power/main.c Change-Id: I0c7d106d2de75d0e40f167245ad4cc37e1556bb0		2012-07-16 15:25:51 -07: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	SELinux: if sel_make_bools errors don't leave inconsistent state	2012-06-01 15:18:16 +08: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: Add proper checks for Android specific capability checks	2012-05-07 18:04:12 -07:00
device_cgroup.c	cgroup: remove cgroup_subsys argument from callbacks	2012-02-02 09:20:22 -08: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