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)
commit2de05a57467c43f58802cdeaa547aee73396b6f3
treee73f96c9954479a6909eb6195631284eac0fa47f
parentab5a4e6381d27a6554e6833383e536773e3a6ec1
parent380c3a545f7de096c0f84344ba70ea4cfd1a059f
Merge branch 'next/devel-exynos5250-1' into next/devel-samsung-2
arch/arm/mach-exynos/include/mach/map.h
arch/arm/mach-exynos/pm.c
arch/arm/plat-samsung/Kconfig