From: Mark Brown <broonie@linaro.org>
Date: Wed, 16 Oct 2013 20:16:41 +0000 (+0100)
Subject: Merge remote-tracking branch 'spi/topic/trivial' into spi-atmel
X-Git-Tag: v3.13-rc1~123^2~28^2~2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=381bd9517a7e611871694689c67901d189cf6a62;p=users%2Fjedix%2Flinux-maple.git

Merge remote-tracking branch 'spi/topic/trivial' into spi-atmel

Conflicts (trivial overlapping cleanups):
	drivers/spi/spi-atmel.c
---

381bd9517a7e611871694689c67901d189cf6a62