Commit 996a77cc authored by Stephen Rothwell's avatar Stephen Rothwell
Browse files

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

# Conflicts:
#	Documentation/devicetree/bindings/pwm/pwm-stm32.txt
parents b28ea841 9e1b4999
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