Skip to content
Commit 6b038c8d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/fix/msiof' into spi-sh-msiof 

Conflicts:
	drivers/spi/spi-sh-msiof.c
parents 3110628d 6d40530e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment