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)
commit421c65fdeef453fb01d0d65130075e6447463887
tree56efe6b62c42e7e77be2a752789ea4460f817dfa
parent523d939ef98fd712632d93a5a2b588e477a7565e
parent152bc19e2fc2b7fce7ffbc2a9cea94b147223702
parent5185a81c02d4118b11e6cb7b5fbf6f15ff7aff90
Merge remote-tracking branches 'spi/fix/pax2xx' and 'spi/fix/rockchip' into spi-linus
drivers/spi/spi-rockchip.c