ARM: Merge for-2635/s5p-dma
authorBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:05:15 +0000 (18:05 +0900)
committerBen Dooks <ben-linux@fluff.org>
Wed, 19 May 2010 09:05:15 +0000 (18:05 +0900)
commit1e8ff636beb6ee5c87868a6081cc4f95b1ccd713
tree5a6be34a53bf640c035d642b4d19388d6a7fd6cc
parent32457942b90aabb9242b450f02d18d9c8d982916
parent7d1a2077a7e519fc0c68617526abea3f72632e60
ARM: Merge for-2635/s5p-dma

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

Conflicts:
arch/arm/mach-s5pv210/Makefile
arch/arm/mach-s5pv210/Makefile
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile