From: Linus Torvalds Date: Wed, 27 May 2009 17:58:23 +0000 (-0700) Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b14f3bd90d2202a83f36eac85bcb3db0fba7d6a6;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Fix up dma_alloc_coherent() on platforms without cache coherency. powerpc: Minor cleanups of kernel virt address space definitions powerpc: Move dma-noncoherent.c from arch/powerpc/lib to arch/powerpc/mm Revert "powerpc: Rework dma-noncoherent to use generic vmalloc layer" --- b14f3bd90d2202a83f36eac85bcb3db0fba7d6a6