tree 1048c2de1f2674a0a5b7e9f8cf2b815c83b77225
parent 46df55ceeaf3d28689242de2dd722857b7ea341f
parent 65d3b04a814679a31fe4d5edd19d89dd5b94fd40
author Linus Torvalds <torvalds@linux-foundation.org> 1454887067 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1454887067 -0800

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

Pull mailbox fixes from Jassi Brar:

 - fix getting element from the pcc-channels array by simply indexing
   into it

 - prevent building mailbox-test driver for archs that don't have IOMEM

* 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
  mailbox: Fix dependencies for !HAS_IOMEM archs
  mailbox: pcc: fix channel calculation in get_pcc_channel()