| commit | b14f3bd90d2202a83f36eac85bcb3db0fba7d6a6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 27 10:58:23 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed May 27 10:58:23 2009 -0700 |
| tree | bad35a2937e40ca211a70dbfbb5432b864eab724 | |
| parent | 911e690e70540f009125bacd16c017eb1a7b1916 [diff] | |
| parent | 8b31e49d1d75729c1da9009664ba52abd1adc628 [diff] |
Merge branch 'merge' of git://git.kernel.org/pub/scm/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"