tree 5a6be34a53bf640c035d642b4d19388d6a7fd6cc
parent 32457942b90aabb9242b450f02d18d9c8d982916
parent 7d1a2077a7e519fc0c68617526abea3f72632e60
author Ben Dooks <ben-linux@fluff.org> 1274259915 +0900
committer Ben Dooks <ben-linux@fluff.org> 1274259915 +0900

ARM: Merge for-2635/s5p-dma

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

Conflicts:
	arch/arm/mach-s5pv210/Makefile