git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b03e119
e53b1fd
)
Merge branch 'mvebu/soc-cpuidle' into mvebu/soc
author
Jason Cooper
<jason@lakedaemon.net>
Thu, 24 Jul 2014 23:10:02 +0000
(23:10 +0000)
committer
Jason Cooper
<jason@lakedaemon.net>
Thu, 24 Jul 2014 23:10:02 +0000
(23:10 +0000)
Conflicts:
arch/arm/mach-mvebu/pmsu.c
Trivial merge