projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 46df55c 65d3b04)
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)
commit63fee123da6a05b48695599c4349ab5de97da5e2
tree1048c2de1f2674a0a5b7e9f8cf2b815c83b77225tree | snapshot
parent46df55ceeaf3d28689242de2dd722857b7ea341fcommit | diff
parent65d3b04a814679a31fe4d5edd19d89dd5b94fd40commit | diff
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()
John Crispins staging tree