projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5d79e9a
53063ec
)
Merge remote-tracking branch 'spi/fix/rspi' into spi-rcar
author
Mark Brown
<broonie@linaro.org>
Wed, 27 Nov 2013 16:37:21 +0000
(16:37 +0000)
committer
Mark 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