projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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()


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.