Merge tag 'mailbox-fixes-v5.0-rc7' of git://git.linaro.org/landing-teams/working...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Feb 2019 18:03:19 +0000 (10:03 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Feb 2019 18:03:19 +0000 (10:03 -0800)
commit301e361072e56a6d6afbf952ae5e746dc8bbb865
tree2b74d591be541795e41d9f49953e3c5472a34d32
parent3ddc14e25e7fef143d35fdd0cad1e8dcf48efaa7
parentd7bf31a0f85faaf63c63c39d55154825a1eaaea9
Merge tag 'mailbox-fixes-v5.0-rc7' of git://git.linaro.org/landing-teams/working/fujitsu/integration

Pull mailbox fixes from Jassi Brar:

 - API: Fix build breakge by exporting the function mbox_flush

 - BRCM: Fix FlexRM ring flush timeout issue

* tag 'mailbox-fixes-v5.0-rc7' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
  mailbox: bcm-flexrm-mailbox: Fix FlexRM ring flush timeout issue
  mailbox: Export mbox_flush()