git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
62a16d0
44b2cef
)
Merge branch 'samsung/cleanup-exynos-clock' into next/soc
author
Arnd Bergmann
<arnd@arndb.de>
Mon, 19 Mar 2012 20:52:33 +0000
(20:52 +0000)
committer
Arnd Bergmann
<arnd@arndb.de>
Tue, 20 Mar 2012 10:07:48 +0000
(10:07 +0000)
Conflicts:
arch/arm/mach-exynos/clock-exynos4.c
arch/arm/mach-exynos/clock.c
The cleanup moves the exynos4 clock implementation away, while
the other branch modifies the file with the old name.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff