Merge commit '20b787fc1284176834cbe7ca2134e4b36bec5828'

diff --cc tmk_core/common/action_layer.c
Simple merge

diff --cc tmk_core/common/hook.c
Simple merge

diff --cc tmk_core/common/hook.h
Simple merge

diff --cc tmk_core/doc/hook.txt
index 0000000000000000000000000000000000000000,1689034e939b9099e95abf6a800cbf3048b164a9..1689034e939b9099e95abf6a800cbf3048b164a9
mode 000000,100644..100644
--- /dev/null
--- 2/doc/hook.txt
+++ b/tmk_core/doc/hook.txt

diff --cc tmk_core/protocol/chibios/README.md
Simple merge

diff --cc tmk_core/tool/chibios/.gitignore
Simple merge

diff --cc tmk_core/tool/chibios/chibios.mk
Simple merge