kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-11-13 07:31:07 +00:00
Code Issues Releases Packages Activity

Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung

Browse source 
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
This commit is contained in:
Kukjin Kim 2011-09-19 10:30:49 +09:00
commit c9312209aa
5 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files