Merge branch 'dt/gic' into next/dt
Conflicts: arch/arm/include/asm/localtimer.h arch/arm/mach-msm/board-msm8x60.c arch/arm/mach-omap2/board-generic.c
No related branches found
No related tags found
Showing
- arch/arm/kernel/kprobes-arm.c 4 additions, 0 deletionsarch/arm/kernel/kprobes-arm.c
- arch/arm/kernel/kprobes-test-arm.c 1323 additions, 0 deletionsarch/arm/kernel/kprobes-test-arm.c
- arch/arm/kernel/kprobes-test-thumb.c 1187 additions, 0 deletionsarch/arm/kernel/kprobes-test-thumb.c
- arch/arm/kernel/kprobes-test.c 1748 additions, 0 deletionsarch/arm/kernel/kprobes-test.c
- arch/arm/kernel/kprobes-test.h 392 additions, 0 deletionsarch/arm/kernel/kprobes-test.h
- arch/arm/kernel/kprobes-thumb.c 7 additions, 0 deletionsarch/arm/kernel/kprobes-thumb.c
- arch/arm/kernel/kprobes.h 8 additions, 0 deletionsarch/arm/kernel/kprobes.h
- arch/arm/kernel/perf_event.c 254 additions, 221 deletionsarch/arm/kernel/perf_event.c
- arch/arm/kernel/perf_event_v6.c 59 additions, 28 deletionsarch/arm/kernel/perf_event_v6.c
- arch/arm/kernel/perf_event_v7.c 196 additions, 199 deletionsarch/arm/kernel/perf_event_v7.c
- arch/arm/kernel/perf_event_xscale.c 47 additions, 43 deletionsarch/arm/kernel/perf_event_xscale.c
- arch/arm/kernel/pmu.c 8 additions, 174 deletionsarch/arm/kernel/pmu.c
- arch/arm/kernel/setup.c 2 additions, 19 deletionsarch/arm/kernel/setup.c
- arch/arm/kernel/sleep.S 27 additions, 58 deletionsarch/arm/kernel/sleep.S
- arch/arm/kernel/smp.c 27 additions, 33 deletionsarch/arm/kernel/smp.c
- arch/arm/kernel/smp_scu.c 1 addition, 1 deletionarch/arm/kernel/smp_scu.c
- arch/arm/kernel/smp_twd.c 45 additions, 2 deletionsarch/arm/kernel/smp_twd.c
- arch/arm/kernel/suspend.c 72 additions, 0 deletionsarch/arm/kernel/suspend.c
- arch/arm/kernel/topology.c 148 additions, 0 deletionsarch/arm/kernel/topology.c
- arch/arm/kernel/traps.c 1 addition, 0 deletionsarch/arm/kernel/traps.c
Loading
Please register or sign in to comment