]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Feb 2016 23:17:47 +0000 (15:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 7 Feb 2016 23:17:47 +0000 (15:17 -0800)
commit313919edabb749f98903505f348c412f3f1b5660
tree1048c2de1f2674a0a5b7e9f8cf2b815c83b77225
parent19d6dca6598f538411189fd4fe65199ed059e0c4
parent2ae24e54f53e72bebcd72bf04ba8e23a565794eb
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()