tree 3176a15279e2521d2391c7b2cec6f7b923faa64b
parent 8144737def6abc49457124424887436531bd6a50
parent 9aac397525dc7945b1582a80cef5860516bca452
author Linus Torvalds <torvalds@linux-foundation.org> 1237392340 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1237392340 -0700

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/ps3: ps3_defconfig updates
  powerpc/mm: Respect _PAGE_COHERENT on classic ppc32 SW
  powerpc/5200: Enable CPU_FTR_NEED_COHERENT for MPC52xx
  ps3/block: Replace mtd/ps3vram by block/ps3vram