Merge commit 'v3.14' into next

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)
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)
diff --cc MAINTAINERS
Simple merge
diff --cc include/linux/fs.h
Simple merge
diff --cc kernel/capability.c
Simple merge
diff --cc security/capability.c
Simple merge
diff --cc security/selinux/hooks.c
Simple merge
diff --cc security/selinux/selinuxfs.c
Simple merge
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)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/fs.h	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/capability.c	patch \|	diff1 \|	diff2 \|	blob \| history
security/capability.c	patch \|	diff1 \|	diff2 \|	blob \| history
security/selinux/hooks.c	patch \|	diff1 \|	diff2 \|	blob \| history
security/selinux/selinuxfs.c	patch \|	diff1 \|	diff2 \|	blob \| history