]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 04:02:07 +0000 (14:02 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 27 Sep 2011 04:02:07 +0000 (14:02 +1000)
commit9d4aae82cc3f1bed85ffa9ceda0a8d0f57b48345
tree75043439413503f278f50b024f47ec4124a92a2a
parentec7f81bc00991ad8d158c2cc320f57c84cfc7c1f
parentc6cb56fc94f4efaec2d4ad74bed2be7883179ccd
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