From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 15 Mar 2013 21:31:37 +0000 (+0100)
Subject: Merge branch 'spear/multiplatform' into next/multiplatform
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~67^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a768d04639307dbebbbbc8f4216e3a06bc602d7;p=pandora-kernel.git

Merge branch 'spear/multiplatform' into next/multiplatform

The spear platform has been cleaned up a lot by Viresh
Kumar, and is relatively easy to convert to multiplatform,
getting us one more step closer to having all ARMv7
platforms included.

I originally did this before 3.8 but merging it never
worked out so far, mostly because of conflicts against
patches in the DMA tree, but also because I did not push very
hard for these.

* spear/multiplatform:
  ARM: spear: enable spear13xx in multi_v7_defconfig
  ARM: spear: fix build error in restart.c
  ARM: spear: use multiplatform configuration options.
  ARM: spear: rename duplicate pl080_plat_data
  ARM: spear: make clock driver independent of headers
  ARM: spear: move generic.h and pl080.h into private dir
  ARM: spear: move all files to mach-spear
  ARM: spear: move spear.h and misc_regs.h into plat-spear
  ARM: spear: merge Kconfig files
  ARM: spear: make spear3xx/6xx mach/spear.h files identical
  ARM: spear: move identical headers to plat-spear/include/mach
  ARM: spear: unify mach/generic.h and mach/irqs.h
  ARM: spear13xx: make mach/dma.h local

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

3a768d04639307dbebbbbc8f4216e3a06bc602d7
Reading git-diff-tree failed