Skip to content
Commit 1e8ff636 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: Merge for-2635/s5p-dma 

Merge branch 'for-2635/s5p-dma' into for-linus/samsung2

Conflicts:
	arch/arm/mach-s5pv210/Makefile
parents 32457942 7d1a2077
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment