git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7d5f880
3e2bd64
)
Merge remote-tracking branch 'spi/fix/s3c64xx' into spi-s3c64xx
author
Mark Brown
<broonie@linaro.org>
Fri, 27 Sep 2013 13:27:56 +0000
(14:27 +0100)
committer
Mark Brown
<broonie@linaro.org>
Fri, 27 Sep 2013 13:27:56 +0000
(14:27 +0100)
Conflicts:
drivers/spi/spi-s3c64xx.c
Trivial merge