Merge branch 'next/spring-cleaning' into next/cleanup

2026-11-13 07:31:07 +00:00 · 2013-04-19 17:18:46 +02:00 · 2013-04-19 17:18:46 +02:00 · dc9c220304
commit dc9c220304
parent 5ed3ebe3be e7b64391ba
36 changed files with 56 additions and 1675 deletions
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
--- a/arch/arm/configs/h7201_defconfig
+++ b/arch/arm/configs/h7201_defconfig
--- a/arch/arm/configs/h7202_defconfig
+++ b/arch/arm/configs/h7202_defconfig
--- a/arch/arm/mach-gemini/Makefile
+++ b/arch/arm/mach-gemini/Makefile
--- a/arch/arm/mach-gemini/board-nas4220b.c
+++ b/arch/arm/mach-gemini/board-nas4220b.c
--- a/arch/arm/mach-gemini/board-rut1xx.c
+++ b/arch/arm/mach-gemini/board-rut1xx.c
--- a/arch/arm/mach-gemini/board-wbd111.c
+++ b/arch/arm/mach-gemini/board-wbd111.c
--- a/arch/arm/mach-gemini/board-wbd222.c
+++ b/arch/arm/mach-gemini/board-wbd222.c
--- a/arch/arm/mach-gemini/common.h
+++ b/arch/arm/mach-gemini/common.h
--- a/arch/arm/mach-gemini/gpio.c
+++ b/arch/arm/mach-gemini/gpio.c
--- a/arch/arm/mach-gemini/include/mach/hardware.h
+++ b/arch/arm/mach-gemini/include/mach/hardware.h
--- a/arch/arm/mach-gemini/irq.c
+++ b/arch/arm/mach-gemini/irq.c
--- a/arch/arm/mach-gemini/mm.c
+++ b/arch/arm/mach-gemini/mm.c
--- a/arch/arm/mach-gemini/include/mach/system.h
+++ b/arch/arm/mach-gemini/include/mach/system.h
--- a/arch/arm/mach-h720x/Kconfig
+++ b/arch/arm/mach-h720x/Kconfig
--- a/arch/arm/mach-h720x/Makefile
+++ b/arch/arm/mach-h720x/Makefile
--- a/arch/arm/mach-h720x/Makefile.boot
+++ b/arch/arm/mach-h720x/Makefile.boot
--- a/arch/arm/mach-h720x/common.c
+++ b/arch/arm/mach-h720x/common.c
--- a/arch/arm/mach-h720x/common.h
+++ b/arch/arm/mach-h720x/common.h
--- a/arch/arm/mach-h720x/cpu-h7201.c
+++ b/arch/arm/mach-h720x/cpu-h7201.c
--- a/arch/arm/mach-h720x/cpu-h7202.c
+++ b/arch/arm/mach-h720x/cpu-h7202.c
--- a/arch/arm/mach-h720x/h7201-eval.c
+++ b/arch/arm/mach-h720x/h7201-eval.c
--- a/arch/arm/mach-h720x/h7202-eval.c
+++ b/arch/arm/mach-h720x/h7202-eval.c
--- a/arch/arm/mach-h720x/include/mach/boards.h
+++ b/arch/arm/mach-h720x/include/mach/boards.h
--- a/arch/arm/mach-h720x/include/mach/debug-macro.S
+++ b/arch/arm/mach-h720x/include/mach/debug-macro.S
--- a/arch/arm/mach-h720x/include/mach/entry-macro.S
+++ b/arch/arm/mach-h720x/include/mach/entry-macro.S
--- a/arch/arm/mach-h720x/include/mach/h7201-regs.h
+++ b/arch/arm/mach-h720x/include/mach/h7201-regs.h
--- a/arch/arm/mach-h720x/include/mach/h7202-regs.h
+++ b/arch/arm/mach-h720x/include/mach/h7202-regs.h
--- a/arch/arm/mach-h720x/include/mach/hardware.h
+++ b/arch/arm/mach-h720x/include/mach/hardware.h
--- a/arch/arm/mach-h720x/include/mach/irqs.h
+++ b/arch/arm/mach-h720x/include/mach/irqs.h
--- a/arch/arm/mach-h720x/include/mach/isa-dma.h
+++ b/arch/arm/mach-h720x/include/mach/isa-dma.h
--- a/arch/arm/mach-h720x/include/mach/timex.h
+++ b/arch/arm/mach-h720x/include/mach/timex.h
--- a/arch/arm/mach-h720x/include/mach/uncompress.h
+++ b/arch/arm/mach-h720x/include/mach/uncompress.h
--- a/arch/arm/mach-l7200/include/mach/debug-macro.S
+++ b/arch/arm/mach-l7200/include/mach/debug-macro.S