Merge branch 'next-samsung-devel' into next-samsung-devel-2
authorKukjin Kim <kgene.kim@samsung.com>
Tue, 4 Oct 2011 11:18:36 +0000 (20:18 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Tue, 4 Oct 2011 11:18:36 +0000 (20:18 +0900)
commitdb3c94a7edc6b29f8d52ba5884dec6a15feeadad
treeac9207a44cecafb9104ca4e1f46aecb9fe01383d
parentc9477f38cba225870862fd9e08868ae3d4abdfe0
parent568f0e278c6dd33dc11bd19c4ad781d1f8d86800
Merge branch 'next-samsung-devel' into next-samsung-devel-2

Conflicts:
arch/arm/mach-exynos4/clock.c
arch/arm/mach-s3c2412/gpio.c
arch/arm/mach-s5p64x0/dma.c
arch/arm/mach-s5p64x0/gpiolib.c
15 files changed:
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-exynos4/clock.c
arch/arm/mach-exynos4/cpu.c
arch/arm/mach-exynos4/include/mach/map.h
arch/arm/mach-exynos4/mach-smdkv310.c
arch/arm/mach-exynos4/pm.c
arch/arm/mach-s3c2412/dma.c
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-s5p64x0/dma.c
arch/arm/mach-s5p64x0/mach-smdk6440.c
arch/arm/mach-s5p64x0/mach-smdk6450.c
arch/arm/mach-s5pv210/Kconfig
arch/arm/plat-s5p/include/plat/pll.h
arch/arm/plat-samsung/Makefile
arch/arm/plat-samsung/include/plat/dma-s3c24xx.h