From: Kukjin Kim Date: Wed, 7 Mar 2012 11:34:41 +0000 (-0800) Subject: Merge branch 'topic/cleanup-use-static' into next/cleanup-use-static X-Git-Tag: v3.4-rc1~91^2~5^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60571f98d292b74586ff8330d8bc965eb01e8df0;p=pandora-kernel.git Merge branch 'topic/cleanup-use-static' into next/cleanup-use-static Conflicts: arch/arm/mach-exynos/dma.c arch/arm/mach-s5p64x0/dma.c arch/arm/mach-s5pc100/dma.c arch/arm/mach-s5pv210/dma.c --- 60571f98d292b74586ff8330d8bc965eb01e8df0 Reading git-diff-tree failed