Commit 85cfe6b6 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/fix/rspi' into spi-rcar 

Conflicts (removal of an error handling fix due to devm conversion):
	drivers/spi/spi-rspi.c
parents 5d79e9ac 53063ec6

There are no changes