From: Mark Brown <broonie@linaro.org>
Date: Thu, 29 Aug 2013 12:59:05 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata
X-Git-Tag: v3.12-rc1~192^2~14^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5f9a9d5113efe11a3b9dad600a6f833274da595;p=pandora-kernel.git

Merge remote-tracking branch 'spi/topic/rspi' into spi-pdata

Conflicts:
	drivers/spi/spi-rspi.c
---

b5f9a9d5113efe11a3b9dad600a6f833274da595
Reading git-diff-tree failed