Merge branch 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujitsu/integration

Pull mailbox framework from Jassi Brar:
 "A framework for Mailbox controllers and clients have been cooking for
  more than a year now.

  Everybody in the CC list had been copied on patchset revisions and
  most of them have made sounds of approval, though just one concrete
  Reviewed-by.  The patchset has also been in linux-next for a couple of
  weeks now and no conflict has been reported.  The framework has the
  backing of at least 5 platforms, though I can't say if/when they
  upstream their drivers (some businesses have 'changed')"

(Further acked-by by Arnd Bergmann and Suman Anna in the pull request
thread)

* 'mailbox-for-linus' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
  dt: mailbox: add generic bindings
  doc: add documentation for mailbox framework
  mailbox: Introduce framework for mailbox
  mailbox: rename pl320-ipc specific mailbox.h

1 files changed, 8 insertions, 0 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index a20df9bf8ab0..b4b05dd4ffe3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5834,6 +5834,14 @@ S:	Maintained
 F:      drivers/net/macvlan.c
 F:      include/linux/if_macvlan.h
 
+MAILBOX API
+M:      Jassi Brar <jassisinghbrar@gmail.com>
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+F:      drivers/mailbox/
+F:      include/linux/mailbox_client.h
+F:      include/linux/mailbox_controller.h
+
 MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
 M:      Michael Kerrisk <mtk.manpages@gmail.com>
 W:      http://www.kernel.org/doc/man-pages