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)
commit6823cfe5531f7507cca5699cda4abd0f65a78bcf
treeba1913690fbb7e93052b9c96d3d09a8d63972207
parent05ad709d04799125ed85dd816fdb558258102172
parent60e59f68824102c87e64c5f51c4e57c0b8a61e46
Merge branch 'merge' of git://git./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