Merge branch 'master' into next

diff --cc security/tomoyo/file.c
Simple merge

diff --cc security/tomoyo/tomoyo.c
Simple merge

diff --cc security/tomoyo/tomoyo.h
Simple merge