Merge tag 'mailbox-v6.1' of git://git.linaro.org/landing-teams/working/fujitsu/integr...