tree ba1913690fbb7e93052b9c96d3d09a8d63972207
parent 05ad709d04799125ed85dd816fdb558258102172
parent 60e59f68824102c87e64c5f51c4e57c0b8a61e46
author Linus Torvalds <torvalds@linux-foundation.org> 1243991170 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1243991170 -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/pmac: Update PowerMac 32-bit defconfig