projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7bfce0f a9e4d4e)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 May 2009 17:58:23 +0000 (10:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 May 2009 17:58:23 +0000 (10:58 -0700)
commit22342cc190c682c8f105ac099e96a7c01db26ddc
treebad35a2937e40ca211a70dbfbb5432b864eab724tree | snapshot
parent7bfce0ff9b26bba593a2f56c8d28d0783634d48acommit | diff
parenta9e4d4e9e83f761000d5f4935a0aa0cf15dca507commit | 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"
Linux Kernel Source Tree.