git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
943a9b9
8bfdfc8
)
Merge branch 'omap-for-v3.11/pm-voltdomain' into omap-for-v3.11/tmp-merge
author
Tony Lindgren
<tony@atomide.com>
Tue, 18 Jun 2013 11:54:29 +0000
(
04:54
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 18 Jun 2013 11:54:29 +0000
(
04:54
-0700)
Conflicts:
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/io.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff