projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d79e9a 53063ec)
Merge remote-tracking branch 'spi/fix/rspi' into spi-rcar
authorMark Brown <broonie@linaro.org>
Wed, 27 Nov 2013 16:37:21 +0000 (16:37 +0000)
committerMark Brown <broonie@linaro.org>
Wed, 27 Nov 2013 16:37:21 +0000 (16:37 +0000)
Conflicts (removal of an error handling fix due to devm conversion):
drivers/spi/spi-rspi.c


Trivial merge
Linux Kernel tree with some unpolished code for Colibri/Apalis modules