Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Aug 2009 03:39:31 +0000 (20:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 27 Aug 2009 03:39:31 +0000 (20:39 -0700)
commite99b1f22f91cc5e2d06699b3d8958a0ff6cb24d9
tree58b6fbd9effac9a45fb15fd0cd73e54833daaa55
parent5311034ddda7aad48934520d3536b9d0e4502672
parentb080f187adb79bbcbe28814b07cbc1ead34c469a
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/ps3: Update ps3_defconfig
  powerpc/ps3: Add missing check for PS3 to rtc-ps3 platform device registration