From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 3 Jun 2009 01:06:10 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: v2.6.30-rc8~1
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6823cfe5531f7507cca5699cda4abd0f65a78bcf;p=~shefty%2Frdma-dev.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/pmac: Update PowerMac 32-bit defconfig
---

6823cfe5531f7507cca5699cda4abd0f65a78bcf