]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitd61bae8deb0be5edda949d632dd783eb945886d4
tree5a6be34a53bf640c035d642b4d19388d6a7fd6cc
parent22311d66f3bdc04f5f72e17eb256b70ab018b776
parentca5c99bcb9a297dc94ee85f8237ec9e91ce51c4c
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