Merge remote-tracking branches 'spi/fix/omap2' and 'spi/fix/rockchip' into spi-linus
authorMark Brown <[email protected]>
Mon, 4 Apr 2016 17:05:49 +0000 (10:05 -0700)
committerMark Brown <[email protected]>
Mon, 4 Apr 2016 17:05:49 +0000 (10:05 -0700)
1  2  3 
drivers/spi/spi-rockchip.c

Simple merge