summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-nomadik
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-03-15 22:31:37 +0100
committerArnd Bergmann <arnd@arndb.de>2013-03-15 22:31:37 +0100
commit3a768d04639307dbebbbbc8f4216e3a06bc602d7 (patch)
treec4d9f24f559929202e1cce10691021c54e80953e /arch/arm/mach-nomadik
parentMerge branch 'cns3xxx/multiplatform' into next/multiplatform (diff)
parentARM: spear: enable spear13xx in multi_v7_defconfig (diff)
downloadlinux-3a768d04639307dbebbbbc8f4216e3a06bc602d7.tar.xz
linux-3a768d04639307dbebbbbc8f4216e3a06bc602d7.zip
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>
Diffstat (limited to 'arch/arm/mach-nomadik')
0 files changed, 0 insertions, 0 deletions