Skip to content
Snippets Groups Projects
Commit bde75567 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'samsung/cleanup-exynos-clock' into next/soc 


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: default avatarArnd Bergmann <arnd@arndb.de>
parents 62a16d02 44b2cef5
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1937 additions and 288 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment