]> git.karo-electronics.de Git - mv-sheeva.git/commit - arch/arm/mach-s5pv310/include/mach/dma.h
Merge branch 'next-s5pv310' into for-next
authorKukjin Kim <kgene.kim@samsung.com>
Fri, 31 Dec 2010 01:52:05 +0000 (10:52 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Fri, 31 Dec 2010 01:52:05 +0000 (10:52 +0900)
commit285dee7ff4fb4b32838694d4378f4aa938cf5b43
treefa15cd1b385898f01ead4649712f6e4fbcd055cd
parent0ae9a22b45b9e9d0f6058e5257b2daf48036dd35
parentfa353e9f409340cefc7650854065cbcea85c347d
Merge branch 'next-s5pv310' into for-next

Conflicts:
arch/arm/mach-s5pv310/Kconfig
arch/arm/mach-s5pv310/Makefile
arch/arm/mach-s5pv310/mach-smdkc210.c
arch/arm/mach-s5pv310/mach-smdkv310.c
arch/arm/plat-samsung/include/plat/devs.h
arch/arm/mach-s5pv310/Kconfig
arch/arm/mach-s5pv310/Makefile
arch/arm/mach-s5pv310/include/mach/irqs.h
arch/arm/mach-s5pv310/include/mach/map.h
arch/arm/mach-s5pv310/mach-smdkc210.c
arch/arm/mach-s5pv310/mach-smdkv310.c
arch/arm/plat-samsung/include/plat/devs.h