please pull powerpc-merge.git

[Paul Mackerras]

Linus,

Please do another pull from

git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge.git

I have moved arch/ppc64/boot over to arch/powerpc/boot, so if you use
a zImage, you will have to use arch/powerpc/boot/zImage.vmode rather
than arch/ppc64/boot/zImage.vmode (for a G5).  I assume you probably
boot a vmlinux using yaboot, though.

Other than that, there is a collection of minor build and bug fixes.
I haven't included the NUMA/sparsemem fix yet (still waiting for
comments on the patch).

Thanks,
Paul.

Benjamin Herrenschmidt:
      powerpc: update defconfigs
      powerpc: pci_64 fixes & cleanups
      ppc: Fix boot with yaboot with ARCH=ppc
      ppc: Fix build with CONFIG_CHRP not set
      powerpc: Make the vDSO functions set error code (#2)

Guido Guenther:
      PowerBook 6,1: headphone not detected after suspend

Kumar Gala:
      powerpc: replace page_to_virt() with lowmem_page_address() for Book-E

Marcelo Tosatti:
      ppc32 8xx: update_mmu_cache() needs unconditional tlbie

Michael Ellerman:
      powerpc: Fixup debugging in lmb.c
      powerpc: More debugging fixups

Olof Johansson:
      powerpc: add new powerbooks to feature table

Paul Mackerras:
      powerpc: Move ppc64 boot wrapper code over to arch/powerpc

 arch/powerpc/Makefile                     |   25 +---
 arch/powerpc/boot/Makefile                |    5 -
 arch/powerpc/boot/README                  |    0 
 arch/powerpc/boot/addRamDisk.c            |    0 
 arch/powerpc/boot/addnote.c               |    0 
 arch/powerpc/boot/crt0.S                  |    0 
 arch/powerpc/boot/div64.S                 |    0 
 arch/powerpc/boot/elf.h                   |    0 
 arch/powerpc/boot/install.sh              |    0 
 arch/powerpc/boot/main.c                  |  122 +++++++++++++-------
 arch/powerpc/boot/page.h                  |    0 
 arch/powerpc/boot/ppc_asm.h               |    0 
 arch/powerpc/boot/prom.c                  |    0 
 arch/powerpc/boot/prom.h                  |    0 
 arch/powerpc/boot/stdio.h                 |    0 
 arch/powerpc/boot/string.S                |    0 
 arch/powerpc/boot/string.h                |    0 
 arch/powerpc/boot/zImage.lds              |    0 
 arch/powerpc/configs/cell_defconfig       |  175 +++++++++++++++++++----------
 arch/powerpc/configs/g5_defconfig         |   53 +++++----
 arch/powerpc/configs/iseries_defconfig    |  159 ++++++++++++++++++--------
 arch/powerpc/configs/maple_defconfig      |  155 +++++++++++++++++---------
 arch/powerpc/configs/pseries_defconfig    |    4 -
 arch/powerpc/kernel/pci_64.c              |   70 +++++++++++-
 arch/powerpc/kernel/rtas_pci.c            |   68 +----------
 arch/powerpc/kernel/setup-common.c        |    1 
 arch/powerpc/kernel/smp.c                 |    7 +
 arch/powerpc/kernel/vdso32/cacheflush.S   |    2 
 arch/powerpc/kernel/vdso32/datapage.S     |    3 
 arch/powerpc/kernel/vdso32/gettimeofday.S |    4 +
 arch/powerpc/kernel/vdso64/cacheflush.S   |    2 
 arch/powerpc/kernel/vdso64/datapage.S     |    3 
 arch/powerpc/kernel/vdso64/gettimeofday.S |    4 +
 arch/powerpc/mm/lmb.c                     |   33 +++--
 arch/powerpc/platforms/iseries/pci.c      |    3 
 arch/powerpc/platforms/maple/pci.c        |   16 ---
 arch/powerpc/platforms/powermac/feature.c |    8 +
 arch/powerpc/platforms/powermac/pci.c     |   62 +++++-----
 arch/powerpc/platforms/pseries/smp.c      |    1 
 arch/ppc/kernel/setup.c                   |   14 ++
 arch/ppc/mm/init.c                        |   23 ++--
 arch/ppc/xmon/start.c                     |    5 +
 include/asm-powerpc/ppc-pci.h             |    1 
 include/asm-powerpc/vdso.h                |    2 
 include/asm-ppc/pgalloc.h                 |    2 
 include/asm-ppc64/pci-bridge.h            |   14 ++
 sound/ppc/tumbler.c                       |    8 +
 47 files changed, 652 insertions(+), 402 deletions(-)
 rename arch/{ppc64/boot/Makefile => powerpc/boot/Makefile} (100%)
 rename arch/{ppc64/boot/README => powerpc/boot/README} (100%)
 rename arch/{ppc64/boot/addRamDisk.c => powerpc/boot/addRamDisk.c} (100%)
 rename arch/{ppc64/boot/addnote.c => powerpc/boot/addnote.c} (100%)
 rename arch/{ppc64/boot/crt0.S => powerpc/boot/crt0.S} (100%)
 rename arch/{ppc64/boot/div64.S => powerpc/boot/div64.S} (100%)
 rename arch/{ppc64/boot/elf.h => powerpc/boot/elf.h} (100%)
 rename arch/{ppc64/boot/install.sh => powerpc/boot/install.sh} (100%)
 rename arch/{ppc64/boot/main.c => powerpc/boot/main.c} (76%)
 rename arch/{ppc64/boot/page.h => powerpc/boot/page.h} (100%)
 rename arch/{ppc64/boot/ppc_asm.h => powerpc/boot/ppc_asm.h} (100%)
 rename arch/{ppc64/boot/prom.c => powerpc/boot/prom.c} (100%)
 rename arch/{ppc64/boot/prom.h => powerpc/boot/prom.h} (100%)
 rename arch/{ppc64/boot/stdio.h => powerpc/boot/stdio.h} (100%)
 rename arch/{ppc64/boot/string.S => powerpc/boot/string.S} (100%)
 rename arch/{ppc64/boot/string.h => powerpc/boot/string.h} (100%)
 rename arch/{ppc64/boot/zImage.lds => powerpc/boot/zImage.lds} (100%)