-
- Downloads
Merge branch 'devel-stable' into devel
Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h
Showing
- arch/arm/Kconfig 13 additions, 2 deletionsarch/arm/Kconfig
- arch/arm/Makefile 2 additions, 1 deletionarch/arm/Makefile
- arch/arm/configs/mx3_defconfig 1 addition, 0 deletionsarch/arm/configs/mx3_defconfig
- arch/arm/include/asm/hw_breakpoint.h 2 additions, 2 deletionsarch/arm/include/asm/hw_breakpoint.h
- arch/arm/kernel/Makefile 1 addition, 0 deletionsarch/arm/kernel/Makefile
- arch/arm/kernel/entry-armv.S 4 additions, 0 deletionsarch/arm/kernel/entry-armv.S
- arch/arm/kernel/entry-header.S 19 additions, 0 deletionsarch/arm/kernel/entry-header.S
- arch/arm/kernel/hw_breakpoint.c 319 additions, 224 deletionsarch/arm/kernel/hw_breakpoint.c
- arch/arm/kernel/iwmmxt.S 42 additions, 13 deletionsarch/arm/kernel/iwmmxt.S
- arch/arm/kernel/perf_event.c 9 additions, 9 deletionsarch/arm/kernel/perf_event.c
- arch/arm/kernel/perf_event_v6.c 15 additions, 15 deletionsarch/arm/kernel/perf_event_v6.c
- arch/arm/kernel/perf_event_v7.c 13 additions, 13 deletionsarch/arm/kernel/perf_event_v7.c
- arch/arm/kernel/perf_event_xscale.c 20 additions, 20 deletionsarch/arm/kernel/perf_event_xscale.c
- arch/arm/kernel/pj4-cp0.c 94 additions, 0 deletionsarch/arm/kernel/pj4-cp0.c
- arch/arm/kernel/ptrace.c 2 additions, 2 deletionsarch/arm/kernel/ptrace.c
- arch/arm/mach-cns3xxx/cns3420vb.c 54 additions, 0 deletionsarch/arm/mach-cns3xxx/cns3420vb.c
- arch/arm/mach-cns3xxx/core.h 0 additions, 2 deletionsarch/arm/mach-cns3xxx/core.h
- arch/arm/mach-cns3xxx/devices.c 1 addition, 0 deletionsarch/arm/mach-cns3xxx/devices.c
- arch/arm/mach-cns3xxx/include/mach/cns3xxx.h 0 additions, 2 deletionsarch/arm/mach-cns3xxx/include/mach/cns3xxx.h
- arch/arm/mach-cns3xxx/include/mach/pm.h 23 additions, 0 deletionsarch/arm/mach-cns3xxx/include/mach/pm.h
Loading
Please register or sign in to comment