]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'next/gscaler-samsung' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Thu, 20 Sep 2012 22:46:56 +0000 (07:46 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Thu, 20 Sep 2012 22:46:56 +0000 (07:46 +0900)
1  2 
arch/arm/mach-exynos/clock-exynos5.c
arch/arm/mach-exynos/include/mach/map.h

Simple merge