From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Apr 2016 01:40:47 +0000 (-0700)
Subject: Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a7109a2ca79ce868620db3fff884277084a9d646;p=deliverable%2Flinux.git

Merge branch 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration

Pull mailbox fixes from Jussi Brar:
 "Misc fixes:

  mailbox-test driver:
   - prevent memory leak and another cosmetic change

  mailbox:
   - change the returned error code

  Xgene driver:
   - return -ENOMEM instead of PTR_ERR for failed devm_kzalloc"

* 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
  mailbox: Stop using ENOSYS for anything other than unimplemented syscalls
  mailbox: mailbox-test: Prevent memory leak
  mailbox: mailbox-test: Use more consistent format for calling copy_from_user()
  mailbox: xgene-slimpro: Fix wrong test for devm_kzalloc
---

a7109a2ca79ce868620db3fff884277084a9d646