git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
58eb042
8bfdfc8
)
Merge branch 'omap/pm-voltdomain-cleanup' into next/soc
author
Arnd Bergmann
<arnd@arndb.de>
Thu, 20 Jun 2013 15:35:16 +0000
(17:35 +0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Thu, 20 Jun 2013 15:35:16 +0000
(17:35 +0200)
Conflicts:
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/io.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff