]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 03:04:59 +0000 (13:04 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 21 Sep 2011 03:04:59 +0000 (13:04 +1000)
commit0795f2a34d34769e5804bab9d9e42ce0ddf4cbbc
treee19b0845f00ec7d804b3a08a827d915dc5bc563d
parent81bc1d6d75a10b1d2b714594bbe2b3156d03e6d1
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