git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
3b3a800
2fe7e4a
)
Merge remote-tracking branch 'spi/topic/devm' into spi-qspi
author
Mark Brown
<broonie@linaro.org>
Mon, 7 Oct 2013 11:02:26 +0000
(12:02 +0100)
committer
Mark Brown
<broonie@linaro.org>
Mon, 7 Oct 2013 11:02:26 +0000
(12:02 +0100)
Conflicts:
drivers/spi/spi-ti-qspi.c
Trivial merge