Merge remote-tracking branch 'spi/topic/samsung' into spi-next

author Mark Brown <[email protected]>

Mon, 2 Apr 2018 14:56:32 +0000 (15:56 +0100)

committer Mark Brown <[email protected]>

Mon, 2 Apr 2018 14:56:32 +0000 (15:56 +0100)
author Mark Brown <[email protected]>
Mon, 2 Apr 2018 14:56:32 +0000 (15:56 +0100)
committer Mark Brown <[email protected]>
Mon, 2 Apr 2018 14:56:32 +0000 (15:56 +0100)
diff --cc .mailmap
Simple merge
diff --cc MAINTAINERS
Simple merge
author	Mark Brown <[email protected]>
	Mon, 2 Apr 2018 14:56:32 +0000 (15:56 +0100)
committer	Mark Brown <[email protected]>
	Mon, 2 Apr 2018 14:56:32 +0000 (15:56 +0100)
		1	2
.mailmap	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history