Merge remote-tracking branches 'spi/topic/blackfin', 'spi/topic/cadence', 'spi/topic...
authorMark Brown <broonie@kernel.org>
Sat, 11 Apr 2015 22:09:09 +0000 (23:09 +0100)
committerMark Brown <broonie@kernel.org>
Sat, 11 Apr 2015 22:09:09 +0000 (23:09 +0100)
commit431959c0793e0d399303a061424dbaa1b33eb940
tree44d89cf7c42021b970c8fc173a6e8500c77547a5
parentf9de73426c69ec3357c31a10af5f5acb037dbbaa
parent057f6061a1972b0d63383cbbbb98795e8ef0a752
parent38b6484e5b7be96ec93ec2c29b752b7d9540e9d4
parent207cda93f0446c2da5461a37252c7468ddc1c2bc
parentff61eb422024a4614f898c1c73625e222b219a5d
Merge remote-tracking branches 'spi/topic/blackfin', 'spi/topic/cadence', 'spi/topic/dw' and 'spi/topic/err' into spi-next
drivers/spi/Kconfig
drivers/spi/spi.c
include/linux/spi/spi.h