Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 May 2016 17:32:48 +0000 (10:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 May 2016 17:32:48 +0000 (10:32 -0700)
commit10cd7158042bf9c949c19dbf0c7ee600d198ed39
tree46309a82e4bf43d74c2092d9292987ad84d85418
parent51e68d055cbabfd36cba3903fd2a223bc98514b1
parentc430cf376fee0b03d9c9293615f9737649de1b12
Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration

Pull mailbox updates from Jassi Brar:
 "OMAP:
   - Remove non-DT support from mailbox driver
   - Move PM from client calls to native driver suspend/resume
   - Trivial cleanups to make checkpatch happy

  STI:
   - Check return from devm_ioremap_resource as ERR_PTR, not NULL"

* 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
  mailbox: Fix devm_ioremap_resource error detection code
  mailbox/omap: kill omap_mbox_{save/restore}_ctx() functions
  mailbox/omap: check for any unread messages during suspend
  mailbox/omap: add support for suspend/resume
  mailbox/omap: store mailbox interrupt type in omap_mbox_device
  mailbox/omap: add blank lines after declarations
  mailbox/omap: remove FSF mailing address paragraph
  mailbox/omap: use variable name for sizeof() operator
  mailbox/omap: drop legacy platform device support