Skip to content
Commit 19dee0d2 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/topic/cleanup' into spi-sh-msiof 

Conflicts:
	drivers/spi/spi-sh-msiof.c
parents b0d0ce8b 8e3489f3
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