Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
authorJames Morris <jmorris@namei.org>
Tue, 8 Mar 2011 00:38:10 +0000 (11:38 +1100)
committerJames Morris <jmorris@namei.org>
Tue, 8 Mar 2011 00:38:10 +0000 (11:38 +1100)
commitfe3fa43039d47ee4e22caf460b79b62a14937f79
tree9eab8d00f1227b9fe0959f32a62d892ed35803ba
parentee009e4a0d4555ed522a631bae9896399674f064
parent026eb167ae77244458fa4b4b9fc171209c079ba7
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next
19 files changed:
fs/btrfs/inode.c
fs/btrfs/xattr.c
fs/ext2/namei.c
fs/ext3/namei.c
fs/ext4/ialloc.c
fs/gfs2/inode.c
fs/jfs/namei.c
fs/namespace.c
fs/ocfs2/namei.c
fs/ocfs2/refcounttree.c
fs/reiserfs/namei.c
fs/xfs/linux-2.6/xfs_iops.c
include/linux/ext3_fs.h
include/linux/security.h
kernel/sysctl.c
security/security.c
security/selinux/hooks.c
security/selinux/ss/policydb.c
security/smack/smack_lsm.c