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

This gets include/asm-ppc64 to be empty.  Apart from that, there is
a bug-fix from Ben H and one from me.  We still make the
arch/powerpc/include/asm symlink, but I'll get rid of that for
64-bit compiles shortly.

Thanks,
Paul.

Benjamin Herrenschmidt:
      powerpc: Fix setting MPIC priority

David Gibson:
      powerpc: Remove imalloc.h

Paul Mackerras:
      powerpc: Trivially merge several headers from asm-ppc64 to asm-powerpc
      powerpc: Merge pci.h
      powerpc: move include/asm-ppc64/ptrace-common.h to arch/powerpc/kernel
      powerpc: Merge spinlock.h
      powerpc: Fix bug in timebase synchronization on 32-bit SMP powermac

Stephen Rothwell:
      ppc32: move some dma routines
      powerpc: merge dma-mapping.h

 arch/powerpc/kernel/pci_64.c          |   18 ----
 arch/powerpc/kernel/ppc_ksyms.c       |    3 -
 arch/powerpc/kernel/ptrace-common.h   |    0 
 arch/powerpc/kernel/ptrace.c          |    3 -
 arch/powerpc/kernel/ptrace32.c        |    3 -
 arch/powerpc/mm/imalloc.c             |    3 -
 arch/powerpc/mm/init_64.c             |    3 -
 arch/powerpc/mm/mmu_decl.h            |   14 +++
 arch/powerpc/mm/pgtable_64.c          |    3 -
 arch/powerpc/platforms/powermac/smp.c |    6 +
 arch/powerpc/sysdev/mpic.c            |   13 ++-
 include/asm-powerpc/dma-mapping.h     |  136 ++++++++++++++++++++++-----------
 include/asm-powerpc/io.h              |   12 ++-
 include/asm-powerpc/mmu.h             |   14 ++-
 include/asm-powerpc/mmu_context.h     |   12 ++-
 include/asm-powerpc/mmzone.h          |    0 
 include/asm-powerpc/pci-bridge.h      |   12 ++-
 include/asm-powerpc/pci.h             |  110 ++++++++++++++++++++-------
 include/asm-powerpc/pgalloc.h         |   11 ++-
 include/asm-powerpc/pgtable-4k.h      |    0 
 include/asm-powerpc/pgtable-64k.h     |    0 
 include/asm-powerpc/pgtable.h         |   20 ++++-
 include/asm-powerpc/ppc-pci.h         |    2 
 include/asm-powerpc/spinlock.h        |   72 ++++++++++++-----
 include/asm-ppc/io.h                  |   17 ++++
 include/asm-ppc64/dma-mapping.h       |  136 ---------------------------------
 include/asm-ppc64/imalloc.h           |   26 ------
 27 files changed, 333 insertions(+), 316 deletions(-)
 rename include/asm-ppc64/ptrace-common.h => arch/powerpc/kernel/ptrace-common.h (100%)
 rename include/{asm-ppc/dma-mapping.h => asm-powerpc/dma-mapping.h} (76%)
 rename include/{asm-ppc64/io.h => asm-powerpc/io.h} (98%)
 rename include/{asm-ppc64/mmu.h => asm-powerpc/mmu.h} (98%)
 rename include/{asm-ppc64/mmu_context.h => asm-powerpc/mmu_context.h} (89%)
 rename include/{asm-ppc64/mmzone.h => asm-powerpc/mmzone.h} (100%)
 rename include/{asm-ppc64/pci-bridge.h => asm-powerpc/pci-bridge.h} (95%)
 rename include/{asm-ppc64/pci.h => asm-powerpc/pci.h} (74%)
 rename include/{asm-ppc64/pgalloc.h => asm-powerpc/pgalloc.h} (94%)
 rename include/{asm-ppc64/pgtable-4k.h => asm-powerpc/pgtable-4k.h} (100%)
 rename include/{asm-ppc64/pgtable-64k.h => asm-powerpc/pgtable-64k.h} (100%)
 rename include/{asm-ppc64/pgtable.h => asm-powerpc/pgtable.h} (98%)
 rename include/{asm-ppc64/spinlock.h => asm-powerpc/spinlock.h} (75%)
 delete mode 100644 include/asm-ppc64/dma-mapping.h
 delete mode 100644 include/asm-ppc64/imalloc.h