Merge branch 'perf/urgent' into perf/core to fix conflicts
Conflicts:
tools/perf/bench/numa.c
Signed-off-by: 
Ingo Molnar <mingo@kernel.org>
No related branches found
No related tags found
Showing
- MAINTAINERS 3 additions, 50 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arc/mm/fault.c 3 additions, 3 deletionsarch/arc/mm/fault.c
- arch/mips/kernel/perf_event_mipsxx.c 2 additions, 2 deletionsarch/mips/kernel/perf_event_mipsxx.c
- arch/mips/mti-malta/malta-int.c 5 additions, 4 deletionsarch/mips/mti-malta/malta-int.c
- arch/mips/ralink/timer.c 1 addition, 1 deletionarch/mips/ralink/timer.c
- arch/um/kernel/exitcode.c 3 additions, 1 deletionarch/um/kernel/exitcode.c
- arch/x86/include/asm/percpu.h 2 additions, 1 deletionarch/x86/include/asm/percpu.h
- arch/x86/kernel/cpu/perf_event.c 3 additions, 3 deletionsarch/x86/kernel/cpu/perf_event.c
- arch/x86/kernel/kvm.c 1 addition, 1 deletionarch/x86/kernel/kvm.c
- arch/x86/kernel/nmi.c 2 additions, 2 deletionsarch/x86/kernel/nmi.c
- arch/xtensa/kernel/entry.S 30 additions, 19 deletionsarch/xtensa/kernel/entry.S
- arch/xtensa/kernel/signal.c 1 addition, 1 deletionarch/xtensa/kernel/signal.c
- arch/xtensa/platforms/iss/network.c 2 additions, 1 deletionarch/xtensa/platforms/iss/network.c
- drivers/clk/clk-nomadik.c 21 additions, 0 deletionsdrivers/clk/clk-nomadik.c
- drivers/clk/mvebu/armada-370.c 2 additions, 2 deletionsdrivers/clk/mvebu/armada-370.c
- drivers/clk/socfpga/clk.c 1 addition, 1 deletiondrivers/clk/socfpga/clk.c
- drivers/clk/versatile/clk-icst.c 1 addition, 1 deletiondrivers/clk/versatile/clk-icst.c
- drivers/gpu/drm/drm_drv.c 1 addition, 1 deletiondrivers/gpu/drm/drm_drv.c
- drivers/gpu/drm/i915/intel_crt.c 24 additions, 4 deletionsdrivers/gpu/drm/i915/intel_crt.c
Loading
Please register or sign in to comment