]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 03:55:19 +0000 (13:55 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Mon, 12 Sep 2011 03:55:19 +0000 (13:55 +1000)
commit53e11adf7b43d86075f71934a8593b53fa2dff0e
tree7faa3f0c6babe9f62c4b6de81f102375d9e19cb3
parent9ec67faf903a0e083e65958df7faf5c07f0d049d
parent5dbe3040c74eef18e66951347eda05b153e69328
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