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

[ARM] S3C: Merge next-s3c64xx-dma2 into for-rmk-devel 

Merge branch 'next-s3c64xx-dma2' into for-rmk-devel

Conflicts:

	arch/arm/plat-s3c64xx/Makefile
parents 543899f6 0b13406a
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