Merge remote-tracking branch 'security-testing/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 26 Jul 2011 03:57:31 +0000 (13:57 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 26 Jul 2011 03:57:31 +0000 (13:57 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:57:31 +0000 (13:57 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:57:31 +0000 (13:57 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc fs/ecryptfs/keystore.c
Simple merge
diff --cc kernel/cgroup.c
Simple merge
diff --cc security/apparmor/domain.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 26 Jul 2011 03:57:31 +0000 (13:57 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 26 Jul 2011 03:57:31 +0000 (13:57 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
fs/ecryptfs/keystore.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/cgroup.c	patch \|	diff1 \|	diff2 \|	blob \| history
security/apparmor/domain.c	patch \|	diff1 \|	diff2 \|	blob \| history