Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (35 commits) ARM: Update (and cut down) mach-types ARM: 6771/1: vexpress: add support for multiple core tiles ARM: 6797/1: hw_breakpoint: Fix newlines in WARNings ARM: 6751/1: vexpress: select applicable errata workarounds in Kconfig ARM: 6753/1: omap4: Enable ARM local timers with OMAP4430 es1.0 exception ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime ARM: pgtable: add pud-level code ARM: 6673/1: LPAE: use phys_addr_t instead of unsigned long for start of membanks ARM: Use long long format when printing meminfo physical addresses ARM: integrator: add Integrator/CP sched_clock support ARM: realview/vexpress: consolidate SMP bringup code ARM: realview/vexpress: consolidate localtimer support ARM: integrator/versatile: consolidate FPGA IRQ handling code ARM: rationalize versatile family Kconfig/Makefile ARM: realview: remove old AMBA device DMA definitions ARM: versatile: remove old AMBA device DMA definitions ARM: vexpress: use new init_early for clock tree and sched_clock init ARM: realview: use new init_early for clock tree and sched_clock init ARM: versatile: use new init_early for clock tree and sched_clock init ARM: integrator: use new init_early for clock tree init ...
Showing
- arch/arm/Kconfig 7 additions, 3 deletionsarch/arm/Kconfig
- arch/arm/include/asm/localtimer.h 7 additions, 1 deletionarch/arm/include/asm/localtimer.h
- arch/arm/include/asm/outercache.h 8 additions, 6 deletionsarch/arm/include/asm/outercache.h
- arch/arm/include/asm/pgtable.h 2 additions, 1 deletionarch/arm/include/asm/pgtable.h
- arch/arm/include/asm/setup.h 1 addition, 1 deletionarch/arm/include/asm/setup.h
- arch/arm/kernel/hw_breakpoint.c 7 additions, 7 deletionsarch/arm/kernel/hw_breakpoint.c
- arch/arm/kernel/setup.c 4 additions, 3 deletionsarch/arm/kernel/setup.c
- arch/arm/kernel/smp.c 3 additions, 4 deletionsarch/arm/kernel/smp.c
- arch/arm/kernel/traps.c 3 additions, 3 deletionsarch/arm/kernel/traps.c
- arch/arm/lib/uaccess_with_memcpy.c 6 additions, 1 deletionarch/arm/lib/uaccess_with_memcpy.c
- arch/arm/mach-exynos4/localtimer.c 2 additions, 1 deletionarch/arm/mach-exynos4/localtimer.c
- arch/arm/mach-integrator/Kconfig 1 addition, 0 deletionsarch/arm/mach-integrator/Kconfig
- arch/arm/mach-integrator/common.h 1 addition, 0 deletionsarch/arm/mach-integrator/common.h
- arch/arm/mach-integrator/core.c 5 additions, 2 deletionsarch/arm/mach-integrator/core.c
- arch/arm/mach-integrator/impd1.c 5 additions, 0 deletionsarch/arm/mach-integrator/impd1.c
- arch/arm/mach-integrator/include/mach/cm.h 2 additions, 2 deletionsarch/arm/mach-integrator/include/mach/cm.h
- arch/arm/mach-integrator/integrator_ap.c 14 additions, 30 deletionsarch/arm/mach-integrator/integrator_ap.c
- arch/arm/mach-integrator/integrator_cp.c 64 additions, 175 deletionsarch/arm/mach-integrator/integrator_cp.c
- arch/arm/mach-msm/timer.c 2 additions, 1 deletionarch/arm/mach-msm/timer.c
- arch/arm/mach-omap2/Kconfig 1 addition, 0 deletionsarch/arm/mach-omap2/Kconfig
Loading
Please register or sign in to comment