Skip to content
Commit 14b8a0f9 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge for-2635/samsung-rtc 

Merge branch 'for-2635/samsung-rtc' into for-linus/samsung2

Conflicts:
	arch/arm/mach-s3c64xx/include/mach/map.h
	arch/arm/plat-samsung/Kconfig
	arch/arm/plat-samsung/Makefile
parents 05a690d2 adc0950c
Hide whitespace changes
Inline Side-by-side
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