projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 911e690 8b31e49)
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)
commitb14f3bd90d2202a83f36eac85bcb3db0fba7d6a6
treebad35a2937e40ca211a70dbfbb5432b864eab724tree | snapshot
parent911e690e70540f009125bacd16c017eb1a7b1916commit | diff
parent8b31e49d1d75729c1da9009664ba52abd1adc628commit | diff
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"
John Crispins staging tree