Merge branch 'next/timer-samsung' into next/clk-exynos
authorKukjin Kim <kgene.kim@samsung.com>
Sat, 9 Mar 2013 07:55:32 +0000 (16:55 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 9 Mar 2013 07:55:32 +0000 (16:55 +0900)
1  2 
arch/arm/mach-exynos/Kconfig

Simple merge