Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up tracing/filters fix from the urgent queue,
we will queue up dependent patches.
Signed-off-by: 
Ingo Molnar <mingo@elte.hu>
Showing
- Documentation/SubmittingPatches 1 addition, 1 deletionDocumentation/SubmittingPatches
- Documentation/arm/tcm.txt 6 additions, 4 deletionsDocumentation/arm/tcm.txt
- Documentation/connector/cn_test.c 1 addition, 1 deletionDocumentation/connector/cn_test.c
- Documentation/connector/connector.txt 4 additions, 4 deletionsDocumentation/connector/connector.txt
- Documentation/networking/timestamping/timestamping.c 1 addition, 1 deletionDocumentation/networking/timestamping/timestamping.c
- Documentation/sound/alsa/HD-Audio-Models.txt 1 addition, 0 deletionsDocumentation/sound/alsa/HD-Audio-Models.txt
- MAINTAINERS 21 additions, 8 deletionsMAINTAINERS
- arch/arm/common/sa1111.c 12 additions, 13 deletionsarch/arm/common/sa1111.c
- arch/arm/configs/h3600_defconfig 0 additions, 1 deletionarch/arm/configs/h3600_defconfig
- arch/arm/configs/iop33x_defconfig 429 additions, 125 deletionsarch/arm/configs/iop33x_defconfig
- arch/arm/include/asm/glue.h 20 additions, 6 deletionsarch/arm/include/asm/glue.h
- arch/arm/include/asm/hardware/iop3xx.h 1 addition, 0 deletionsarch/arm/include/asm/hardware/iop3xx.h
- arch/arm/include/asm/smp_plat.h 16 additions, 0 deletionsarch/arm/include/asm/smp_plat.h
- arch/arm/include/asm/unistd.h 1 addition, 0 deletionsarch/arm/include/asm/unistd.h
- arch/arm/kernel/entry-armv.S 6 additions, 12 deletionsarch/arm/kernel/entry-armv.S
- arch/arm/kernel/entry-common.S 2 additions, 9 deletionsarch/arm/kernel/entry-common.S
- arch/arm/kernel/head-common.S 3 additions, 1 deletionarch/arm/kernel/head-common.S
- arch/arm/kernel/smp.c 4 additions, 9 deletionsarch/arm/kernel/smp.c
- arch/arm/kernel/smp_twd.c 3 additions, 1 deletionarch/arm/kernel/smp_twd.c
- arch/arm/kernel/traps.c 4 additions, 1 deletionarch/arm/kernel/traps.c
Loading
Please register or sign in to comment