git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c708379
0158026
)
Merge remote-tracking branch 'spi/fix/clps711x' into spi-clps711x
author
Mark Brown
<broonie@linaro.org>
Thu, 3 Oct 2013 16:25:40 +0000
(17:25 +0100)
committer
Mark Brown
<broonie@linaro.org>
Thu, 3 Oct 2013 16:25:40 +0000
(17:25 +0100)
Conflicts:
drivers/spi/spi-clps711x.c
Trivial merge