Merge remote-tracking branch 'spi/fix/rspi' into spi-rcar
authorMark Brown <broonie@linaro.org>
Wed, 27 Nov 2013 16:37:21 +0000 (16:37 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 27 Nov 2013 16:37:21 +0000 (16:37 +0000)
commit85cfe6b64d785b170367322d9d130a530db7b276
tree729b102a1cd53dd1d0fd02cb193bc98b8f2162ac
parent5d79e9ac89b45643c98b68ea7ce62c80b3b4e160
parent53063ec6e2cc38000f98a5de557b7e4fed186cfc
Merge remote-tracking branch 'spi/fix/rspi' into spi-rcar

Conflicts (removal of an error handling fix due to devm conversion):
drivers/spi/spi-rspi.c