From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 7 Feb 2016 23:17:47 +0000 (-0800)
Subject: Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu... 
X-Git-Tag: v4.5-rc3~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=63fee123da6a05b48695599c4349ab5de97da5e2;p=users%2Fhch%2Fuuid.git

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()
---

63fee123da6a05b48695599c4349ab5de97da5e2