Merge remote-tracking branches 'spi/topic/acpi', 'spi/topic/axi-engine', 'spi/topic...

author Mark Brown <[email protected]>

Fri, 11 Mar 2016 07:28:25 +0000 (14:28 +0700)

committer Mark Brown <[email protected]>

Fri, 11 Mar 2016 07:28:25 +0000 (14:28 +0700)
author Mark Brown <[email protected]>
Fri, 11 Mar 2016 07:28:25 +0000 (14:28 +0700)
committer Mark Brown <[email protected]>
Fri, 11 Mar 2016 07:28:25 +0000 (14:28 +0700)
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc drivers/spi/spi-bcm2835aux.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]>
	Fri, 11 Mar 2016 07:28:25 +0000 (14:28 +0700)
committer	Mark Brown <[email protected]>
	Fri, 11 Mar 2016 07:28:25 +0000 (14:28 +0700)
		1	2	3	4	5
drivers/spi/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/spi/spi-bcm2835aux.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/spi/spi.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
include/linux/spi/spi.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history