Merge remote-tracking branches 'spi/fix/pax2xx' and 'spi/fix/rockchip' into spi-linus
authorMark Brown <broonie@kernel.org>
Sun, 24 Jul 2016 21:08:16 +0000 (22:08 +0100)
committerMark Brown <broonie@kernel.org>
Sun, 24 Jul 2016 21:08:16 +0000 (22:08 +0100)
1  2  3 
drivers/spi/spi-rockchip.c

Simple merge