git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
035a61c
d6540b1
)
Merge branch 'clk-omap-legacy' into clk-next
author
Michael Turquette
<mturquette@linaro.org>
Fri, 30 Jan 2015 18:57:21 +0000
(10:57 -0800)
committer
Michael Turquette
<mturquette@linaro.org>
Mon, 2 Feb 2015 22:23:33 +0000
(14:23 -0800)
Conflicts:
arch/arm/mach-omap2/cclock3xxx_data.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff