Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Dec 2014 20:09:37 +0000 (12:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Dec 2014 20:09:37 +0000 (12:09 -0800)
Pull mailbox framework updates from Jassi Brar.

* 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
  Mailbox: Add support for Platform Communication Channel
  mailbox/omap: adapt to the new mailbox framework
  mailbox: add tx_prepare client callback
  mailbox: Don't unnecessarily re-arm the polling timer


Trivial merge