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

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f64410e 455c6fd)

author	James Morris <james.l.morris@oracle.com>
	Mon, 14 Apr 2014 01:23:14 +0000 (11:23 +1000)
committer	James Morris <james.l.morris@oracle.com>
	Mon, 14 Apr 2014 01:23:14 +0000 (11:23 +1000)
commit	ecd740c6f2f092b90b95fa35f757973589eaaca2
tree	ce02b1e18c4fc5729699251460cd8be7604d8401	tree \| snapshot
parent	f64410ec665479d7b4b77b7519e814253ed0f686	commit \| diff
parent	455c6fdbd219161bd09b1165f11699d6d73de11c	commit \| diff

Merge commit 'v3.14' into next

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	diff1 \|	diff2 \|	blob \| history
kernel/capability.c	diff1 \|	diff2 \|	blob \| history
security/capability.c	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	diff1 \|	diff2 \|	blob \| history
security/selinux/selinuxfs.c	diff1 \|	diff2 \|	blob \| history

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