Merge branch 'clksrc' into devel
Conflicts: arch/arm/mach-vexpress/v2m.c arch/arm/plat-omap/counter_32k.c arch/arm/plat-versatile/Makefile
Showing
- arch/arm/Kconfig 22 additions, 4 deletionsarch/arm/Kconfig
- arch/arm/Kconfig.debug 1 addition, 1 deletionarch/arm/Kconfig.debug
- arch/arm/common/timer-sp.c 1 addition, 3 deletionsarch/arm/common/timer-sp.c
- arch/arm/include/asm/sched_clock.h 118 additions, 0 deletionsarch/arm/include/asm/sched_clock.h
- arch/arm/include/asm/system.h 5 additions, 0 deletionsarch/arm/include/asm/system.h
- arch/arm/include/asm/traps.h 21 additions, 2 deletionsarch/arm/include/asm/traps.h
- arch/arm/kernel/Makefile 3 additions, 1 deletionarch/arm/kernel/Makefile
- arch/arm/kernel/entry-common.S 137 additions, 65 deletionsarch/arm/kernel/entry-common.S
- arch/arm/kernel/ftrace.c 98 additions, 5 deletionsarch/arm/kernel/ftrace.c
- arch/arm/kernel/irq.c 3 additions, 1 deletionarch/arm/kernel/irq.c
- arch/arm/kernel/perf_event.c 34 additions, 2414 deletionsarch/arm/kernel/perf_event.c
- arch/arm/kernel/perf_event_v6.c 672 additions, 0 deletionsarch/arm/kernel/perf_event_v6.c
- arch/arm/kernel/perf_event_v7.c 906 additions, 0 deletionsarch/arm/kernel/perf_event_v7.c
- arch/arm/kernel/perf_event_xscale.c 807 additions, 0 deletionsarch/arm/kernel/perf_event_xscale.c
- arch/arm/kernel/sched_clock.c 69 additions, 0 deletionsarch/arm/kernel/sched_clock.c
- arch/arm/kernel/smp.c 3 additions, 2 deletionsarch/arm/kernel/smp.c
- arch/arm/kernel/vmlinux.lds.S 1 addition, 0 deletionsarch/arm/kernel/vmlinux.lds.S
- arch/arm/mach-at91/at91rm9200_time.c 1 addition, 3 deletionsarch/arm/mach-at91/at91rm9200_time.c
- arch/arm/mach-at91/at91sam926x_time.c 1 addition, 3 deletionsarch/arm/mach-at91/at91sam926x_time.c
- arch/arm/mach-bcmring/core.c 4 additions, 10 deletionsarch/arm/mach-bcmring/core.c
Loading
Please register or sign in to comment