From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 23 Oct 2012 13:02:21 +0000 (+0100)
Subject: Merge tag 'spi-linus' into spi-next
X-Git-Tag: firefly_0821_release~3680^2~1459^2~10^2~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=32111abb508424d1d110fa471d940160abe251f5;p=firefly-linux-kernel-4.4.55.git

Merge tag 'spi-linus' into spi-next

spi: Fixes for v3.7

A bunch of fixes here, mostly minor except for the pl022 which has just
been a bit of a shambles all round, the recent runtime PM changes have
as far as I can tell never worked so they're just getting thrown out.

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

32111abb508424d1d110fa471d940160abe251f5