Merge branch 'next/devel-exynos5250-1' into next/devel-samsung-2
authorKukjin Kim <kgene.kim@samsung.com>
Sat, 19 May 2012 18:04:59 +0000 (03:04 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sat, 19 May 2012 18:04:59 +0000 (03:04 +0900)
1  2 
arch/arm/mach-exynos/include/mach/map.h
arch/arm/mach-exynos/pm.c
arch/arm/plat-samsung/Kconfig

Simple merge
Simple merge