From: Mark Brown <broonie@linaro.org>
Date: Mon, 7 Oct 2013 11:02:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/topic/devm' into spi-qspi
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~15^2~9^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dabefd56c6ee883bae0bdce4d5396c3f21286ab8;p=pandora-kernel.git

Merge remote-tracking branch 'spi/topic/devm' into spi-qspi

Conflicts:
	drivers/spi/spi-ti-qspi.c
---

dabefd56c6ee883bae0bdce4d5396c3f21286ab8
Reading git-diff-tree failed