]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 03:19:12 +0000 (13:19 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 23 Sep 2011 03:19:12 +0000 (13:19 +1000)
commitb7bd44116b0c0ee7f16b873b230647bebad6911c
tree460506a55aee147d88f572b0e1ba0564a696d193
parent056c3ed9230138f6b5eac0d971e95f70945bdb49
parent6bce98edc3365a8f780ff3944ac7992544c194fe
Merge remote-tracking branch 'security/next'

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