tree 3d5bc852bf109c3e22c00b3edb98f586d44a2e12
parent 6296c41259af263780a976d9e2db6bb581709d45
parent a75e4a85f49e7f5d71cf0e425bc009c15ad3b5c4
author Linus Torvalds <torvalds@linux-foundation.org> 1473185707 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1473185707 -0700

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