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)
commit14ba9a2e4bacc6f5a0dbe0de5390daedd544508f
tree90b0d639f577feada25fb56837c3e8350b7de035
parentb859e7d13bcc18b56faa7e2f78db5ba8ab874a15
parent86c22f8c9a3b71d42d38bfcd80372de72f573713
Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration

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