Merge remote-tracking branches 'spi/topic/omap-100k', 'spi/topic/omap-uwire', 'spi...

author Mark Brown <[email protected]>

Sat, 11 Apr 2015 22:09:18 +0000 (23:09 +0100)

committer Mark Brown <[email protected]>

Sat, 11 Apr 2015 22:09:18 +0000 (23:09 +0100)
author Mark Brown <[email protected]>
Sat, 11 Apr 2015 22:09:18 +0000 (23:09 +0100)
committer Mark Brown <[email protected]>
Sat, 11 Apr 2015 22:09:18 +0000 (23:09 +0100)
diff --cc drivers/spi/spi-pl022.c
Simple merge
diff --cc drivers/spi/spi.c
Simple merge
diff --cc include/linux/spi/spi.h
Simple merge
author	Mark Brown <[email protected]>
	Sat, 11 Apr 2015 22:09:18 +0000 (23:09 +0100)
committer	Mark Brown <[email protected]>
	Sat, 11 Apr 2015 22:09:18 +0000 (23:09 +0100)
		1	2	3	4	5	6
drivers/spi/spi-pl022.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
drivers/spi/spi.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history
include/linux/spi/spi.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	blob \| history