From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 6 Sep 2016 18:15:07 +0000 (-0700)
Subject: Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu... 
X-Git-Tag: v4.8-rc6~25
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=46738ab31fe668ea1d4413dd459af2632f6fef8d

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

Pull mailbox fixes from Jassi Brar:
 "Misc fixes for BCM mailbox driver

   - Fix build warnings by making static functions used within the file.
   - Check for potential NULL before dereferencing
   - Fix link error by defining HAS_DMA dependency"

* 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
  fix:mailbox:bcm-pdc-mailbox:mark symbols static where possible
  mailbox: bcm-pdc: potential NULL dereference in pdc_shutdown()
  mailbox: Add HAS_DMA Kconfig dependency to BCM_PDC_MBOX
---

46738ab31fe668ea1d4413dd459af2632f6fef8d