From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 Mar 2009 16:05:40 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d941d0ed6bf274ca267dd4de5861ffd24e1ae8f8;p=linux-2.6-omap-h63xx.git

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
---

d941d0ed6bf274ca267dd4de5861ffd24e1ae8f8