git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b599dc0
cc4b1e2
)
Merge branch 'omap/cleanup-prcm-part2' into next/dt
author
Arnd Bergmann
<arnd@arndb.de>
Thu, 15 Nov 2012 16:59:54 +0000
(17:59 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Thu, 15 Nov 2012 16:59:54 +0000
(17:59 +0100)
This resolves a nontrivial conflict where the omap_prcm_restart
is removed in one branch but another use is added in another
branch.
Conflicts:
arch/arm/mach-omap2/cm33xx.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/prm_common.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff