]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitdf37fd3bcd64af5b57511626fb984a3f2903179e
tree8d4f14f4a99b8b465828a314620f3b3aa030713f
parent6a401be94757a888f44f55558249cfe37a6433d1
parent4a2221ca57344040f0e464aaa2cadc03f4f529df
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