[git pull] Please pull powerpc.git merge branch

Benjamin Herrenschmidt
2009-08-27T03:34:29Z

Hi Linus !

Here are a couple of last minute patches for 2.6.31. One is a regression fix
(afaik) where a PS3 driver gets incorrectly loaded on other platforms and
crashes, along with a PS3 defconfig update.
The following changes since commit f415c413f458837bd0c27086b79aca889f9435e4:
Linus Torvalds (1):
Merge git://git.kernel.org/.../davem/net-2.6

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge

Geert Uytterhoeven (1):
powerpc/ps3: Add missing check for PS3 to rtc-ps3 platform device registration

Geoff Levand (1):
powerpc/ps3: Update ps3_defconfig

arch/powerpc/configs/ps3_defconfig | 211 +++++++++++++-----------------------
arch/powerpc/platforms/ps3/time.c | 4 +
2 files changed, 79 insertions(+), 136 deletions(-)