Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jun 2009 01:06:10 +0000 (18:06 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Jun 2009 01:06:10 +0000 (18:06 -0700)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/pmac: Update PowerMac 32-bit defconfig


Trivial merge