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)
commit282ec0ea65dab88fda51b5b9b649958ae42f4ac0
tree6248eb4ec9f5da24d496afa55db4fa491f0e6295
parentd8f520727f769164fa6ff0ad4a4d965336966999
parentc687c46e9e4527c4b4d82bc3cca58c1b08bcfb83
parent251831bd4f4903415da7f0ce04dc0de26bc43f1d
Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next
drivers/acpi/acpi_apd.c
drivers/spi/Kconfig
drivers/spi/spi-ti-qspi.c
drivers/spi/spi.c
include/linux/spi/spi.h