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

Merge remote-tracking branch 'spi/fix/clps711x' into spi-clps711x 

Conflicts:
	drivers/spi/spi-clps711x.c
parents c7083790 0158026c
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