From: Kukjin Kim Date: Mon, 19 Sep 2011 01:30:49 +0000 (+0900) Subject: Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung X-Git-Tag: v3.2-rc1~40^2~13^2~24^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9312209aa9fdef05b03d63bbead63bb720fd133;p=pandora-kernel.git 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 --- c9312209aa9fdef05b03d63bbead63bb720fd133 Reading git-diff-tree failed