projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b4482af 213d27a)
Merge tag 'spi-linus' into spi-next
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 23 Oct 2012 13:02:21 +0000 (14:02 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 23 Oct 2012 13:02:21 +0000 (14:02 +0100)
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

1  2 
drivers/spi/spi-pl022.c patch | diff1 | diff2 | blob | history

diff --cc drivers/spi/spi-pl022.c
Simple merge
Domain: System / Kernel;