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)
commit60571f98d292b74586ff8330d8bc965eb01e8df0
tree8d4f14f4a99b8b465828a314620f3b3aa030713f
parenta5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13
parent6d259a25b56d15ea3cb4b7f2195a188326812d88
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
arch/arm/mach-exynos/common.c
arch/arm/mach-exynos/dma.c
arch/arm/mach-s5p64x0/dma.c
arch/arm/mach-s5pc100/dma.c
arch/arm/mach-s5pv210/dma.c