]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'security/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 02:57:10 +0000 (13:57 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 02:57:10 +0000 (13:57 +1100)
commit639394bef45be0c5617904a3dc0c93118bc504fb
treee6ddc4611de85ca6608fbb1b2bd1c7136c938d51
parentc71f60ac868ea56f1b5548fa2d3d729b63eb6b2a
parent545a7260343bbaf11c7f1a4b8c3d9660bb9266e5
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