Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next
authorMark Brown <broonie@kernel.org>
Wed, 26 Apr 2017 14:58:22 +0000 (15:58 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 26 Apr 2017 14:58:22 +0000 (15:58 +0100)
1  2  3 
drivers/acpi/acpi_apd.c
drivers/spi/Kconfig
drivers/spi/spi-ti-qspi.c
drivers/spi/spi.c
include/linux/spi/spi.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge