[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
Showing
arch/arm/plat-s3c/dma.c
0 → 100644
arch/arm/plat-s3c64xx/dma.c
0 → 100644
Please register or sign in to comment