git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
04cf399
e499ada
2dacb97
)
Merge branches 'common/pfc' and 'common/clkfwk' into rmobile/marzen
author
Paul Mundt
<lethal@linux-sh.org>
Mon, 9 Jan 2012 01:03:09 +0000
(10:03 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Mon, 9 Jan 2012 01:03:09 +0000
(10:03 +0900)
Conflicts:
arch/arm/mach-shmobile/clock-sh73a0.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff