Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung
commitc9312209aa9fdef05b03d63bbead63bb720fd133
authorKukjin Kim <kgene.kim@samsung.com>
Mon, 19 Sep 2011 01:30:49 +0000 (19 10:30 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Mon, 19 Sep 2011 01:30:49 +0000 (19 10:30 +0900)
tree6704773403e34969a27f177bef22e4125378a3df
parentd5663e7a404ae97888bb8e7a7376de3fb0878ddd
parent2213d0c0bae510df3860a48e107a5ba17ac72e99
Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung

Conflicts:
arch/arm/mach-exynos4/clock.c
arch/arm/mach-s5p64x0/clock-s5p6440.c
arch/arm/mach-s5p64x0/clock-s5p6450.c
arch/arm/mach-s5pc100/clock.c
arch/arm/mach-s5pv210/clock.c
arch/arm/mach-exynos4/clock.c
arch/arm/mach-s5p64x0/clock-s5p6440.c
arch/arm/mach-s5p64x0/clock-s5p6450.c
arch/arm/mach-s5pc100/clock.c
arch/arm/mach-s5pv210/clock.c