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)
commitfcdcc79628a1919bde9acf239e364f65bab6327c
tree5499be387cf3028c90ac083b1cf866ebed7bf7e0
parent7a8d44bc89e5cddcd5c0704a11a90484d36ba6ba
parenta0a90718f18264dc904d34a580f332006f5561e9
Merge branch 'topic/acpi' of git://git./linux/kernel/git/broonie/spi into spi-pxa2xx
drivers/spi/Kconfig
drivers/spi/Makefile