From: Mark Brown <broonie@linaro.org>
Date: Wed, 27 Nov 2013 16:37:21 +0000 (+0000)
Subject: Merge remote-tracking branch 'spi/fix/rspi' into spi-rcar
X-Git-Tag: v3.14-rc1~91^2~4^6~1^2~1^2~3
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85cfe6b64d785b170367322d9d130a530db7b276;p=pandora-kernel.git

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
---

85cfe6b64d785b170367322d9d130a530db7b276
Reading git-diff-tree failed