Merge branch 'samsung/cleanup' into next/cleanup2

2026-10-16 22:39:48 +00:00 · 2012-01-09 16:06:31 +00:00 · 2012-01-09 16:06:31 +00:00 · b48741cce3
commit b48741cce3
parent 54b6c82ac9 a07613a54d
1285 changed files with 13157 additions and 13546 deletions
--- a/Documentation/arm/memory.txt
+++ b/Documentation/arm/memory.txt
--- a/Documentation/devicetree/bindings/arm/gic.txt
+++ b/Documentation/devicetree/bindings/arm/gic.txt
--- a/Documentation/devicetree/bindings/arm/vic.txt
+++ b/Documentation/devicetree/bindings/arm/vic.txt
--- a/Documentation/virtual/kvm/api.txt
+++ b/Documentation/virtual/kvm/api.txt
--- a/33
+++ b/33
--- a/2
+++ b/2
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
--- a/arch/arm/common/pl330.c
+++ b/arch/arm/common/pl330.c
--- a/arch/arm/common/timer-sp.c
+++ b/arch/arm/common/timer-sp.c
--- a/arch/arm/common/vic.c
+++ b/arch/arm/common/vic.c
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
--- a/arch/arm/configs/pcontrol_g20_defconfig
+++ b/arch/arm/configs/pcontrol_g20_defconfig
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
--- a/arch/arm/include/asm/bug.h
+++ b/arch/arm/include/asm/bug.h
--- a/arch/arm/include/asm/cti.h
+++ b/arch/arm/include/asm/cti.h
--- a/arch/arm/include/asm/edac.h
+++ b/arch/arm/include/asm/edac.h
--- a/arch/arm/include/asm/entry-macro-vic2.S
+++ b/arch/arm/include/asm/entry-macro-vic2.S
--- a/arch/arm/include/asm/gpio.h
+++ b/arch/arm/include/asm/gpio.h
--- a/arch/arm/include/asm/hardirq.h
+++ b/arch/arm/include/asm/hardirq.h
--- a/arch/arm/include/asm/hardware/entry-macro-gic.S
+++ b/arch/arm/include/asm/hardware/entry-macro-gic.S
--- a/arch/arm/include/asm/hardware/gic.h
+++ b/arch/arm/include/asm/hardware/gic.h
--- a/arch/arm/include/asm/hardware/iop3xx.h
+++ b/arch/arm/include/asm/hardware/iop3xx.h
--- a/arch/arm/include/asm/hardware/vic.h
+++ b/arch/arm/include/asm/hardware/vic.h
--- a/arch/arm/include/asm/idmap.h
+++ b/arch/arm/include/asm/idmap.h
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
--- a/arch/arm/include/asm/opcodes.h
+++ b/arch/arm/include/asm/opcodes.h
--- a/arch/arm/include/asm/page.h
+++ b/arch/arm/include/asm/page.h
--- a/arch/arm/include/asm/perf_event.h
+++ b/arch/arm/include/asm/perf_event.h
--- a/arch/arm/include/asm/pgalloc.h
+++ b/arch/arm/include/asm/pgalloc.h
--- a/arch/arm/include/asm/pgtable-2level.h
+++ b/arch/arm/include/asm/pgtable-2level.h
--- a/arch/arm/include/asm/pgtable-3level-hwdef.h
+++ b/arch/arm/include/asm/pgtable-3level-hwdef.h
--- a/arch/arm/include/asm/pgtable-3level-types.h
+++ b/arch/arm/include/asm/pgtable-3level-types.h
--- a/arch/arm/include/asm/pgtable-3level.h
+++ b/arch/arm/include/asm/pgtable-3level.h
--- a/arch/arm/include/asm/pgtable-hwdef.h
+++ b/arch/arm/include/asm/pgtable-hwdef.h
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
--- a/arch/arm/include/asm/pmu.h
+++ b/arch/arm/include/asm/pmu.h
--- a/arch/arm/include/asm/proc-fns.h
+++ b/arch/arm/include/asm/proc-fns.h
--- a/arch/arm/include/asm/processor.h
+++ b/arch/arm/include/asm/processor.h
--- a/arch/arm/include/asm/sched_clock.h
+++ b/arch/arm/include/asm/sched_clock.h
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
--- a/arch/arm/include/asm/swab.h
+++ b/arch/arm/include/asm/swab.h
--- a/arch/arm/include/asm/system.h
+++ b/arch/arm/include/asm/system.h
--- a/arch/arm/include/asm/tlb.h
+++ b/arch/arm/include/asm/tlb.h
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
--- a/arch/arm/kernel/hw_breakpoint.c
+++ b/arch/arm/kernel/hw_breakpoint.c
--- a/arch/arm/kernel/kprobes-test.c
+++ b/arch/arm/kernel/kprobes-test.c
--- a/arch/arm/kernel/machine_kexec.c
+++ b/arch/arm/kernel/machine_kexec.c
--- a/arch/arm/kernel/opcodes.c
+++ b/arch/arm/kernel/opcodes.c
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
--- a/arch/arm/kernel/perf_event_v6.c
+++ b/arch/arm/kernel/perf_event_v6.c
--- a/arch/arm/kernel/perf_event_v7.c
+++ b/arch/arm/kernel/perf_event_v7.c
--- a/arch/arm/kernel/perf_event_xscale.c
+++ b/arch/arm/kernel/perf_event_xscale.c
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
--- a/arch/arm/kernel/sched_clock.c
+++ b/arch/arm/kernel/sched_clock.c
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
--- a/arch/arm/kernel/sleep.S
+++ b/arch/arm/kernel/sleep.S
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
--- a/arch/arm/kernel/suspend.c
+++ b/arch/arm/kernel/suspend.c
--- a/arch/arm/kernel/swp_emulate.c
+++ b/arch/arm/kernel/swp_emulate.c
--- a/arch/arm/kernel/tcm.c
+++ b/arch/arm/kernel/tcm.c
--- a/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
--- a/arch/arm/lib/call_with_stack.S
+++ b/arch/arm/lib/call_with_stack.S
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
--- a/arch/arm/mach-at91/at91cap9.c
+++ b/arch/arm/mach-at91/at91cap9.c
--- a/arch/arm/mach-at91/at91cap9_devices.c
+++ b/arch/arm/mach-at91/at91cap9_devices.c
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
--- a/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
--- a/arch/arm/mach-at91/at91rm9200_time.c
+++ b/arch/arm/mach-at91/at91rm9200_time.c
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
--- a/arch/arm/mach-at91/at91sam926x_time.c
+++ b/arch/arm/mach-at91/at91sam926x_time.c
--- a/arch/arm/mach-at91/at91sam9_alt_reset.S
+++ b/arch/arm/mach-at91/at91sam9_alt_reset.S
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
--- a/arch/arm/mach-at91/at91sam9rl.c
+++ b/arch/arm/mach-at91/at91sam9rl.c
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
--- a/arch/arm/mach-at91/board-1arm.c
+++ b/arch/arm/mach-at91/board-1arm.c
--- a/arch/arm/mach-at91/board-afeb-9260v1.c
+++ b/arch/arm/mach-at91/board-afeb-9260v1.c
--- a/arch/arm/mach-at91/board-cam60.c
+++ b/arch/arm/mach-at91/board-cam60.c
--- a/arch/arm/mach-at91/board-cap9adk.c
+++ b/arch/arm/mach-at91/board-cap9adk.c
--- a/arch/arm/mach-at91/board-carmeva.c
+++ b/arch/arm/mach-at91/board-carmeva.c
--- a/arch/arm/mach-at91/board-cpu9krea.c
+++ b/arch/arm/mach-at91/board-cpu9krea.c
--- a/arch/arm/mach-at91/board-cpuat91.c
+++ b/arch/arm/mach-at91/board-cpuat91.c
--- a/arch/arm/mach-at91/board-csb337.c
+++ b/arch/arm/mach-at91/board-csb337.c
--- a/arch/arm/mach-at91/board-csb637.c
+++ b/arch/arm/mach-at91/board-csb637.c
--- a/arch/arm/mach-at91/board-dt.c
+++ b/arch/arm/mach-at91/board-dt.c
--- a/Show more
+++ b/Show more