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

Merge remote-tracking branch 'spi/topic/devm' into spi-qspi 

Conflicts:
	drivers/spi/spi-ti-qspi.c
parents 3b3a8001 2fe7e4ad
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