Kukjin Kim c9312209aa Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung ...

Conflicts:
	arch/arm/mach-exynos4/clock.c
	arch/arm/mach-s5p64x0/clock-s5p6440.c
	arch/arm/mach-s5p64x0/clock-s5p6450.c
	arch/arm/mach-s5pc100/clock.c
	arch/arm/mach-s5pv210/clock.c

2011-09-19 10:30:49 +09:00

30 KiB

Raw Blame History

View Raw