Merge remote-tracking branch 'spi/fix/rockchip' into spi-linus
authorMark Brown <broonie@kernel.org>
Fri, 3 Oct 2014 15:33:35 +0000 (16:33 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 3 Oct 2014 15:33:35 +0000 (16:33 +0100)
commit62d02e41eaf08534203384ce5468e2d3ec337677
tree4d467eea03cb2a338fbbb4e7c93b3ecee7a6ff94
parentfe82dcec644244676d55a1384c958d5f67979adb
parenta24e70c0ac146f8bcae3cdb7f514950d5b32219e
Merge remote-tracking branch 'spi/fix/rockchip' into spi-linus
drivers/spi/spi-rockchip.c