Colin Cross 3515161181 Merge branch 'linux-tegra-2.6.36' into android-tegra-2.6.36 ...

Conflicts:
	arch/arm/mm/cache-v6.S

Change-Id: I1a2063218dd705a762a40f4a9dfe504ce1a1d491

2011-01-07 17:20:53 -08:00

..

apparmor

AppArmor: Fix locking from removal of profile namespace

2010-09-08 09:19:34 +10:00

integrity/ima

ima: fix add LSM rule bug

2011-01-07 13:58:48 -08:00

keys

KEYS: Fix bug in keyctl_session_to_parent() if parent has no session keyring

2010-09-10 07:30:00 -07:00

selinux

tty: fix fu_list abuse

2010-08-18 08:35:47 -04:00

smack

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2010-08-04 15:31:02 -07:00

tomoyo

TOMOYO: Don't abuse sys_getpid(), sys_getppid()

2010-09-27 10:53:18 +10:00

capability.c

Merge branch 'writable_limits' of git://decibel.fi.muni.cz/~xslaby/linux

2010-08-10 12:07:51 -07:00

commoncap.c

security: Add AID_NET_RAW and AID_NET_ADMIN capability check in cap_capable().

2010-09-29 17:49:19 -07:00

device_cgroup.c

Merge branch 'master' into next

2010-05-06 10:56:07 +10:00

inode.c

securityfs: Drop dentry reference count when mknod fails

2010-08-02 15:34:59 +10:00

Kconfig

AppArmor: Enable configuring and building of the AppArmor security module

2010-08-02 15:38:34 +10:00

lsm_audit.c

Merge branch 'master' into next

2010-05-06 10:56:07 +10: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

Merge branch 'writable_limits' of git://decibel.fi.muni.cz/~xslaby/linux

2010-08-10 12:07:51 -07:00