From: Mark Brown <broonie@kernel.org>
Date: Fri, 21 Nov 2014 23:43:29 +0000 (+0000)
Subject: Merge remote-tracking branch 'lsk/v3.10/topic/mailbox' into linux-linaro-lsk
X-Git-Tag: firefly_0821_release~3680^2~36^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=50881c752b92d9750ea0e3c49a504d9fe732e999;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'lsk/v3.10/topic/mailbox' into linux-linaro-lsk

Conflicts:
	drivers/mailbox/mailbox.c
	include/linux/mailbox_controller.h
---

50881c752b92d9750ea0e3c49a504d9fe732e999