Merge remote-tracking branch 'lsk/v3.10/topic/mailbox' into linux-linaro-lsk
authorMark Brown <broonie@kernel.org>
Fri, 21 Nov 2014 23:43:29 +0000 (23:43 +0000)
committerMark Brown <broonie@kernel.org>
Fri, 21 Nov 2014 23:43:29 +0000 (23:43 +0000)
Conflicts:
drivers/mailbox/mailbox.c
include/linux/mailbox_controller.h


Trivial merge