Merge remote-tracking branch 'mailbox/mailbox-for-next'

diff --cc Documentation/devicetree/bindings/mailbox/mtk-gce.txt
index 2ef7ff67cb2b0cd0d451b1f3e2a3a04e43240fe1,8e81916556a30f6e19791354714b62d3ffad1451..89a59b9c81f93effb7547f2b63287f44354aea64
--- 1/Documentation/devicetree/bindings/mailbox/mtk-gce.txt
--- 2/Documentation/devicetree/bindings/mailbox/mtk-gce.txt
+++ b/Documentation/devicetree/bindings/mailbox/mtk-gce.txt
@@@ -35,13 -35,10 +35,14 @@@ Optional properties for a client device
    start_offset: the start offset of register address that GCE can access.
    size: the total size of register address that GCE can access.
  
 +Optional properties for a client mutex node:
 +- mediatek,gce-events: GCE events used by clients. The event numbers are
 +  defined in 'dt-bindings/gce/<chip>-gce.h'.
 +
  Some vaules of properties are defined in 'dt-bindings/gce/mt8173-gce.h',
- 'dt-binding/gce/mt8183-gce.h' or 'dt-bindings/gce/mt6779-gce.h'. Such as
- sub-system ids, thread priority, event ids.
+ 'dt-binding/gce/mt8183-gce.h', 'dt-binding/gce/mt8192-gce.h',
+ 'dt-binding/gce/mt8195-gce.h' or 'dt-bindings/gce/mt6779-gce.h'.
+ Such as sub-system ids, thread priority, event ids.
  
  Example:
  

diff --cc MAINTAINERS
Simple merge