]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 04:27:34 +0000 (14:27 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 9 Sep 2011 04:27:34 +0000 (14:27 +1000)
commit4b8f7b94b7fe5e43848bf0e1a9df687181f9f986
tree82c2ab49e4fd049ecc423a9e131e7445de1b506a
parente49f3c2756ad47dc90520c10e52efa2146a3320c
parent403d1d0319ad73b5ccf251745af4c7000331a76b
Merge remote-tracking branch 'security/next'

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