Jiri Kosina 4b7bd36470 Merge branch 'master' into for-next ...

Conflicts:
	MAINTAINERS
	arch/arm/mach-omap2/pm24xx.c
	drivers/scsi/bfa/bfa_fcpim.c

Needed to update to apply fixes for which the old branch was too
outdated.

2010-12-22 18:57:02 +01:00

..

include

tree-wide: fix comment/printk typos

2010-11-01 15:38:34 -04:00

.gitignore

.gitignore: ignore apparmor/rlim_names.h

2010-10-21 10:12:35 +11:00

apparmorfs.c

Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

2010-10-22 10:52:56 -07:00

audit.c

AppArmor: basic auditing infrastructure.

2010-08-02 15:35:11 +10:00

capability.c

AppArmor: mediation of non file objects

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

context.c

AppArmor: contexts used in attaching policy to system objects

2010-08-02 15:35:12 +10:00

domain.c

AppArmor: fix build warnings for non-const use of get_task_cred

2010-08-02 15:49:00 +10:00

file.c

AppArmor: file enforcement routines

2010-08-02 15:35:14 +10:00

ipc.c

AppArmor: fix build warnings for non-const use of get_task_cred

2010-08-02 15:49:00 +10:00

Kconfig

apparmor: depends on NET

2010-08-05 07:36:51 -04:00

lib.c

AppArmor: Fix splitting an fqname into separate namespace and profile names

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

lsm.c

APPARMOR: Fix memory leak of apparmor_init()

2010-11-11 07:36:22 +11:00

Makefile

AppArmor: Enable configuring and building of the AppArmor security module

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

match.c

AppArmor: dfa match engine

2010-08-02 15:35:13 +10:00

path.c

fs: take dcache_lock inside __d_path

2010-10-25 21:26:12 -04:00

policy_unpack.c

AppArmor: policy routines for loading and unpacking policy

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

policy.c

APPARMOR: Fix memory leak of alloc_namespace()

2010-11-11 07:36:18 +11:00

procattr.c

AppArmor: userspace interfaces

2010-08-02 15:35:13 +10:00

resource.c

AppArmor: Fix security_task_setrlimit logic for 2.6.36 changes

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

sid.c

AppArmor: core policy routines

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