Merge branch 'kprobes-test-fixes' of git://git.linaro.org/people/tixy/kernel into fixes
Showing
- Documentation/DocBook/media/Makefile 2 additions, 2 deletionsDocumentation/DocBook/media/Makefile
- Documentation/devicetree/bindings/i2c/i2c-rk3x.txt 42 additions, 0 deletionsDocumentation/devicetree/bindings/i2c/i2c-rk3x.txt
- Documentation/devicetree/bindings/i2c/i2c-sunxi-p2wi.txt 41 additions, 0 deletionsDocumentation/devicetree/bindings/i2c/i2c-sunxi-p2wi.txt
- Documentation/kbuild/makefiles.txt 1 addition, 1 deletionDocumentation/kbuild/makefiles.txt
- Documentation/kernel-parameters.txt 10 additions, 4 deletionsDocumentation/kernel-parameters.txt
- Documentation/thermal/nouveau_thermal 4 additions, 3 deletionsDocumentation/thermal/nouveau_thermal
- MAINTAINERS 11 additions, 2 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arm/Kconfig 1 addition, 19 deletionsarch/arm/Kconfig
- arch/arm/boot/dts/armada-375-db.dts 2 additions, 0 deletionsarch/arm/boot/dts/armada-375-db.dts
- arch/arm/boot/dts/armada-385-db.dts 2 additions, 0 deletionsarch/arm/boot/dts/armada-385-db.dts
- arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts 1 addition, 1 deletionarch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
- arch/arm/configs/multi_v7_defconfig 1 addition, 0 deletionsarch/arm/configs/multi_v7_defconfig
- arch/arm/configs/omap2plus_defconfig 1 addition, 0 deletionsarch/arm/configs/omap2plus_defconfig
- arch/arm/include/asm/ftrace.h 1 addition, 1 deletionarch/arm/include/asm/ftrace.h
- arch/arm/kernel/kprobes-test-arm.c 20 additions, 10 deletionsarch/arm/kernel/kprobes-test-arm.c
- arch/arm/kernel/kprobes-test.c 10 additions, 0 deletionsarch/arm/kernel/kprobes-test.c
- arch/arm/kernel/probes-arm.c 3 additions, 3 deletionsarch/arm/kernel/probes-arm.c
- arch/arm/mach-bcm/Kconfig 3 additions, 4 deletionsarch/arm/mach-bcm/Kconfig
- arch/arm/mach-berlin/Kconfig 1 addition, 5 deletionsarch/arm/mach-berlin/Kconfig
Loading
Please register or sign in to comment