Merge branch 'topic/cleanup-use-static' into next/cleanup-use-static
authorKukjin Kim <kgene.kim@samsung.com>
Wed, 7 Mar 2012 11:34:41 +0000 (03:34 -0800)
committerKukjin Kim <kgene.kim@samsung.com>
Wed, 7 Mar 2012 11:34:41 +0000 (03:34 -0800)
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


Trivial merge