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)
1  2 
drivers/spi/spi-rockchip.c

Simple merge