Merge commit '5b944a71a192977c1c018bbcfa0c52dca48e2368' into m0-up

Conflicts:
	fs/ecryptfs/ecryptfs_kernel.h
	security/tomoyo/mount.c
	security/tomoyo/realpath.c