git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ee009e4 026eb16)

author	James Morris <jmorris@namei.org>
	Tue, 8 Mar 2011 00:38:10 +0000 (11:38 +1100)
committer	James Morris <jmorris@namei.org>
	Tue, 8 Mar 2011 00:38:10 +0000 (11:38 +1100)
commit	fe3fa43039d47ee4e22caf460b79b62a14937f79
tree	9eab8d00f1227b9fe0959f32a62d892ed35803ba	tree \| snapshot
parent	ee009e4a0d4555ed522a631bae9896399674f064	commit \| diff
parent	026eb167ae77244458fa4b4b9fc171209c079ba7	commit \| diff

Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next

19 files changed:

fs/btrfs/inode.c	diff1 \|	diff2 \|	blob \| history
fs/btrfs/xattr.c	diff1 \|	diff2 \|	blob \| history
fs/ext2/namei.c	diff1 \|	diff2 \|	blob \| history
fs/ext3/namei.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/ialloc.c	diff1 \|	diff2 \|	blob \| history
fs/gfs2/inode.c	diff1 \|	diff2 \|	blob \| history
fs/jfs/namei.c	diff1 \|	diff2 \|	blob \| history
fs/namespace.c	diff1 \|	diff2 \|	blob \| history
fs/ocfs2/namei.c	diff1 \|	diff2 \|	blob \| history
fs/ocfs2/refcounttree.c	diff1 \|	diff2 \|	blob \| history
fs/reiserfs/namei.c	diff1 \|	diff2 \|	blob \| history
fs/xfs/linux-2.6/xfs_iops.c	diff1 \|	diff2 \|	blob \| history
include/linux/ext3_fs.h	diff1 \|	diff2 \|	blob \| history
include/linux/security.h	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history
security/security.c	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history
security/selinux/ss/policydb.c	diff1 \|	diff2 \|	blob \| history
security/smack/smack_lsm.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.