tree 6a4345fe0f908d60f52085b97818be705c62af8e
parent 543899f610799426babb5313682fd9c249e34677
parent 0b13406a1f1928ec71e81dde52cb62d72ffd28ef
author Ben Dooks <ben-linux@fluff.org> 1242660749 +0100
committer Ben Dooks <ben-linux@fluff.org> 1242660749 +0100

[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