please pull powerpc-merge.git

[Paul Mackerras]

Linus,

Please do a pull from

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

With this, arch/ppc64 is now empty.  There is still stuff in
include/asm-ppc64; that will get moved out shortly.  Apart from that
there are a few other fixes as listed in the shortlog below.

Thanks,
Paul.

Benjamin Herrenschmidt:
      powerpc: Workaround for offb on 64 bits platforms
      powerpc: merge align.c

David Woodhouse:
      Avoid use of uninitialised spinlock in EEH.

Kumar Gala:
      ppc: Fix MPC83xx device table
      ppc: Fix warnings related to seq_file

Michael Ellerman:
      powerpc: Fix typo in topology.h

Mike Kravetz:
      Remove SPAN_OTHER_NODES config definition

Nick Piggin:
      powerpc: Fix database regression due to scheduler changes

Olaf Hering:
      ppc boot: replace string labels with numbers

Paul Mackerras:
      powerpc: Fix delay functions for 601 processors
      powerpc: Move remaining .c files from arch/ppc64 to arch/powerpc
      powerpc: Fix compile error on pSeries arising from delay.h changes
      powerpc: time-of-day fixes for 32-bit CHRP systems
      powerpc: Fix a couple of compile warnings for 32-bit compiles
      powerpc: Move defconfig over and remove remaining arch/ppc64 files
      offb: Fix compile error on ppc32 systems

Segher Boessenkool:
      powerpc: Maple: request I/O resource.

 arch/powerpc/Kconfig                         |   13 
 arch/powerpc/Makefile                        |    9 
 arch/powerpc/boot/crt0.S                     |   23 
 arch/powerpc/configs/ppc64_defconfig         |  346 +++++-
 arch/powerpc/configs/pseries_defconfig       |    1 
 arch/powerpc/kernel/Makefile                 |    7 
 arch/powerpc/kernel/align.c                  |  530 ++++++++++
 arch/powerpc/kernel/idle_64.c                |    0 
 arch/powerpc/kernel/misc_32.S                |    8 
 arch/powerpc/kernel/nvram_64.c               |    0 
 arch/powerpc/kernel/rtas-rtc.c               |    6 
 arch/powerpc/kernel/time.c                   |   28 +
 arch/powerpc/platforms/chrp/setup.c          |   11 
 arch/powerpc/platforms/chrp/smp.c            |    1 
 arch/powerpc/platforms/chrp/time.c           |    3 
 arch/powerpc/platforms/maple/time.c          |   11 
 arch/powerpc/platforms/pseries/eeh.c         |    3 
 arch/powerpc/platforms/pseries/setup.c       |    4 
 arch/ppc/kernel/Makefile                     |    4 
 arch/ppc/kernel/align.c                      |  410 --------
 arch/ppc/kernel/pci.c                        |    1 
 arch/ppc/platforms/85xx/mpc85xx_ads_common.h |    2 
 arch/ppc/platforms/85xx/stx_gp3.h            |    2 
 arch/ppc/syslib/mpc83xx_sys.c                |   28 -
 arch/ppc64/Kconfig.debug                     |   65 -
 arch/ppc64/Makefile                          |  142 ---
 arch/ppc64/configs/bpa_defconfig             | 1024 -------------------
 arch/ppc64/configs/g5_defconfig              | 1392 --------------------------
 arch/ppc64/configs/iSeries_defconfig         |  998 -------------------
 arch/ppc64/configs/maple_defconfig           | 1062 --------------------
 arch/ppc64/configs/pSeries_defconfig         | 1371 --------------------------
 arch/ppc64/kernel/Makefile                   |    7 
 arch/ppc64/kernel/align.c                    |  396 -------
 drivers/video/offb.c                         |   41 +
 include/asm-powerpc/cputable.h               |   22 
 include/asm-powerpc/delay.h                  |   40 -
 include/asm-powerpc/eeh.h                    |    4 
 include/asm-powerpc/topology.h               |    4 
 38 files changed, 936 insertions(+), 7083 deletions(-)
 rename arch/{ppc64/defconfig => powerpc/configs/ppc64_defconfig} (90%)
 create mode 100644 arch/powerpc/kernel/align.c
 rename arch/{ppc64/kernel/idle.c => powerpc/kernel/idle_64.c} (100%)
 rename arch/{ppc64/kernel/nvram.c => powerpc/kernel/nvram_64.c} (100%)
 delete mode 100644 arch/ppc/kernel/align.c
 delete mode 100644 arch/ppc64/Kconfig.debug
 delete mode 100644 arch/ppc64/Makefile
 delete mode 100644 arch/ppc64/configs/bpa_defconfig
 delete mode 100644 arch/ppc64/configs/g5_defconfig
 delete mode 100644 arch/ppc64/configs/iSeries_defconfig
 delete mode 100644 arch/ppc64/configs/maple_defconfig
 delete mode 100644 arch/ppc64/configs/pSeries_defconfig
 delete mode 100644 arch/ppc64/kernel/Makefile
 delete mode 100644 arch/ppc64/kernel/align.c