git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a4d5247
d3442b2
)
Merge branch 'sh/pm-runtime' into sh-latest
author
Paul Mundt
<lethal@linux-sh.org>
Thu, 12 Jan 2012 03:57:32 +0000
(12:57 +0900)
committer
Paul Mundt
<lethal@linux-sh.org>
Thu, 12 Jan 2012 03:57:32 +0000
(12:57 +0900)
Conflicts:
arch/sh/kernel/cpu/sh4a/clock-sh7723.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff