Commit c84e2c32 authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

Merge remote-tracking branch 'mailbox/mailbox-for-next' 

# Conflicts:
#	Documentation/devicetree/bindings/mailbox/stm32-ipcc.txt
parents 89b01e09 575c3c41
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment