Merge branch 'bcmring/removal' into next/cleanup2

From "Christian Daudt" <csd@broadcom.com>: Remove mach-bcmring as this is no longer maintained or used. Updated the removal with: - drop the edit to mach-types requested by Russell King - eliminate defconfig mod from patch 1 requested Olof Johansson Also switched to using git send-email to avoid word-wrapping problems * bcmring/removal: ARM: Remove mach-bcmring Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Merge branch 'bcmring/removal' into next/cleanup2
0b40b4b4 · Arnd Bergmann · 4369c5f3 · 25e4b485 · 4369c5f3 · 4369c5f3
Commit 0b40b4b4 authored Sep 28, 2012 by Arnd Bergmann
--- a/arch/arm/mach-bcmring/include/mach/timer.h
+++ b/arch/arm/mach-bcmring/include/mach/timer.h
--- a/arch/arm/mach-bcmring/include/mach/timex.h
+++ b/arch/arm/mach-bcmring/include/mach/timex.h
--- a/arch/arm/mach-bcmring/include/mach/uncompress.h
+++ b/arch/arm/mach-bcmring/include/mach/uncompress.h
--- a/arch/arm/mach-bcmring/irq.c
+++ b/arch/arm/mach-bcmring/irq.c
--- a/arch/arm/mach-bcmring/mm.c
+++ b/arch/arm/mach-bcmring/mm.c
--- a/arch/arm/mach-bcmring/timer.c
+++ b/arch/arm/mach-bcmring/timer.c
--- a/drivers/mtd/nand/bcm_umi_nand.c
+++ b/drivers/mtd/nand/bcm_umi_nand.c
--- a/drivers/mtd/nand/nand_bcm_umi.h
+++ b/drivers/mtd/nand/nand_bcm_umi.h