]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 03:35:55 +0000 (14:35 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 12 Oct 2011 03:35:55 +0000 (14:35 +1100)
commit7f39df45d09000cc33c00f4f0ed0f3a3f2528a73
treee260b666c3acb90c7c79cf6e9a7faf90ebf72f37
parenta220c3be4511f3c9f77e61ad864760966be91212
parente00fb3f7af111d1b3252f7d622213d2e22be65f5
Merge remote-tracking branch 'security/next'

Conflicts:
fs/ocfs2/xattr.c
Documentation/kernel-parameters.txt
MAINTAINERS
drivers/char/tpm/tpm.c
fs/btrfs/xattr.c
fs/gfs2/inode.c
fs/xfs/xfs_iops.c
kernel/cred.c
security/tomoyo/common.c