]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security-testing/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:57:31 +0000 (13:57 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 03:57:31 +0000 (13:57 +1000)
commit4912e1ee78647d15895e5fbfc6812753a0da3bc3
treec1b58016970448347284dd0c69e85d347af54278
parentfaa91509469da4c0a70f20bf4a3d6bd45a2fc194
parent29412f0f6a19e34336368f13eab848091c343952
Merge remote-tracking branch 'security-testing/next'

Conflicts:
security/tomoyo/realpath.c
MAINTAINERS
fs/ecryptfs/keystore.c
kernel/cgroup.c
security/apparmor/domain.c