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

Pull mailbox framework updates from Jassi Brar.

* 'mailbox-devel' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
  mailbox: Add Altera mailbox driver
  mailbox: check for bit set before polling
  Mailbox: Fix return value check in pcc_init()

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/mailbox/pcc.c
index e8902f8dddfce6f664ab616b9b61ea2777ba2401,70576fb707a5be482774d91e265c4be8b6e49f47..977c814cdf6f6a7137e592acbe8f45b9bcaf7336
--- 1/drivers/mailbox/pcc.c
--- 2/drivers/mailbox/pcc.c
+++ b/drivers/mailbox/pcc.c
@@@ -393,9 -393,9 +393,9 @@@ static int __init pcc_init(void
        pcc_pdev = platform_create_bundle(&pcc_mbox_driver,
                        pcc_mbox_probe, NULL, 0, NULL, 0);
  
-       if (!pcc_pdev) {
+       if (IS_ERR(pcc_pdev)) {
 -              pr_err("Err creating PCC platform bundle\n");
 +              pr_debug("Err creating PCC platform bundle\n");
-               return -ENODEV;
+               return PTR_ERR(pcc_pdev);
        }
  
        return 0;