]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 05:21:40 +0000 (15:21 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 26 Sep 2011 05:21:40 +0000 (15:21 +1000)
commitd3f65f52c3b2da086d74a2513cd2f72ded60df08
tree2344256bfd1a5d91479e6f4362d0bc6fede65c46
parent91b052f4d3033daf57e4f9872da6f2338c1646a4
parenta427fd14d3edf6396c4b9638dbc8e2972afaa05b
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