From: Mark Brown <broonie@linaro.org>
Date: Thu, 3 Oct 2013 16:25:40 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/fix/clps711x' into spi-clps711x
X-Git-Tag: omap-for-v3.13/fixes-for-merge-window-take2~15^2~24^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b2322d662237a4b635a755df15e21b9ff80716b;p=pandora-kernel.git

Merge remote-tracking branch 'spi/fix/clps711x' into spi-clps711x

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

2b2322d662237a4b635a755df15e21b9ff80716b
Reading git-diff-tree failed