[git pull] Please pull powerpc.git merge branch

Benjamin Herrenschmidt
2009-03-13T05:20:43Z

Hi Linus !

So here's the new ps3 nvram driver for 2.6.29 that we discussed earlier

Cheers,
Ben.

The following changes since commit 9ead64974b05501bbac0d63a47c99fa786d064ba:
Linus Torvalds (1):
Merge git://git.kernel.org/.../sam/kbuild-fixes

are available in the git repository at:

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

Geert Uytterhoeven (1):
ps3/block: Replace mtd/ps3vram by block/ps3vram

arch/powerpc/platforms/ps3/Kconfig | 7 +
drivers/block/Makefile | 1 +
drivers/block/ps3vram.c | 865 ++++++++++++++++++++++++++++++++++++
drivers/mtd/devices/Kconfig | 7 -
drivers/mtd/devices/Makefile | 1 -
drivers/mtd/devices/ps3vram.c | 768 --------------------------------
6 files changed, 873 insertions(+), 776 deletions(-)
create mode 100644 drivers/block/ps3vram.c
delete mode 100644 drivers/mtd/devices/ps3vram.c