]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 04:09:08 +0000 (15:09 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 4 Oct 2011 04:09:08 +0000 (15:09 +1100)
commit20b1c9e94b8afa0d069d57e7b50bfe54c8585f6a
tree2354467cc1b0b17a7b1e7e4ab6336cea1d38c5a5
parent70a54eea663ec038c9edbf76fbed682836af3f3c
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