Merge branch 'topic/acpi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@kernel.org>
Tue, 9 Feb 2016 18:20:39 +0000 (18:20 +0000)
committerMark Brown <broonie@kernel.org>
Tue, 9 Feb 2016 18:20:39 +0000 (18:20 +0000)
1  2 
drivers/spi/Kconfig
drivers/spi/Makefile

Simple merge
Simple merge