From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 27 Aug 2009 03:39:31 +0000 (-0700)
Subject: Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
X-Git-Tag: tegra-9.12.13.ER~1756
X-Git-Url: http://nv-tegra.nvidia.com/gitweb/?p=linux-2.6.git;a=commitdiff_plain;h=e99b1f22f91cc5e2d06699b3d8958a0ff6cb24d9

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
---

e99b1f22f91cc5e2d06699b3d8958a0ff6cb24d9