Merge remote-tracking branches 'spi/topic/orion', 'spi/topic/pxa2xx', 'spi/topic...
authorMark Brown <broonie@kernel.org>
Sun, 8 Feb 2015 03:16:55 +0000 (11:16 +0800)
committerMark Brown <broonie@kernel.org>
Sun, 8 Feb 2015 03:16:55 +0000 (11:16 +0800)
commit4f9f4548a5c741412fffaf76530f243e319c41e8
tree1c3fd5fd75f468068a108e00d949a256f5865273
parent8328509c4bdf28b83fd7104ca9da01bf3b58c7b0
parent23244404e2ae788b19245adb1eb604cce1270e72
parent9064bf3c3cdf92f6b9ac6634ff570dedf0035992
parent0667dd5f6c203480f2e8dcb3fc039ef723453a2f
parent97cf56697a31e083c04aa3ec30710f24bbdac86f
parent75d30c51f8a841d4f40b76fb6ce23927f8f140cf
Merge remote-tracking branches 'spi/topic/orion', 'spi/topic/pxa2xx', 'spi/topic/qup', 'spi/topic/rockchip' and 'spi/topic/samsung' into spi-next
drivers/spi/Kconfig
drivers/spi/spi-pxa2xx-pxadma.c
drivers/spi/spi-pxa2xx.c
include/linux/spi/pxa2xx_spi.h