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

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

# Conflicts:
#	Documentation/devicetree/bindings/remoteproc/stm32-rproc.txt
parents 600f3b7e 070a8e80
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