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)
commit50881c752b92d9750ea0e3c49a504d9fe732e999
treeb98cbd45d5381d0182527a507861fbaafb570bc2
parent09cc926e9a6002790e69ed213217ef9874888624
parentc583b1fec06304d6128f02b1bffff27202c66abf
Merge remote-tracking branch 'lsk/v3.10/topic/mailbox' into linux-linaro-lsk

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