Merge remote-tracking branches 'spi/fix/omap2' and 'spi/fix/rockchip' into spi-linus
authorMark Brown <broonie@kernel.org>
Mon, 4 Apr 2016 17:05:49 +0000 (10:05 -0700)
committerMark Brown <broonie@kernel.org>
Mon, 4 Apr 2016 17:05:49 +0000 (10:05 -0700)
commitcb39f732abbe4f38d2bef8e0a1c8bd5c242fc1b7
tree5637e0b0ff63cf31b38fab525b67d5e3f7f24ea6
parent2b657a586a84ed65bb5f5af773140578ce5f15a0
parent3525e0aac91c4de5d20b1f22a6c6e2b39db3cc96
parente4c0e06f949b9493cafe952c3029576b47c2a7c4
Merge remote-tracking branches 'spi/fix/omap2' and 'spi/fix/rockchip' into spi-linus
drivers/spi/spi-rockchip.c