Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Completely minor snmp doc conflict.
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- .clang-format 42 additions, 1 deletion.clang-format
- Documentation/devicetree/bindings/arm/cpu-capacity.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/arm/cpu-capacity.txt
- Documentation/devicetree/bindings/arm/idle-states.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/arm/idle-states.txt
- Documentation/devicetree/bindings/arm/sp810.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/arm/sp810.txt
- Documentation/devicetree/bindings/arm/topology.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/arm/topology.txt
- Documentation/devicetree/bindings/clock/marvell,mmp2.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/clock/marvell,mmp2.txt
- Documentation/devicetree/bindings/display/arm,pl11x.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/display/arm,pl11x.txt
- Documentation/devicetree/bindings/gpio/gpio-mvebu.txt 0 additions, 2 deletionsDocumentation/devicetree/bindings/gpio/gpio-mvebu.txt
- Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt 1 addition, 1 deletion...n/devicetree/bindings/interrupt-controller/arm,gic-v3.txt
- Documentation/devicetree/bindings/soc/qcom/qcom,glink.txt 1 addition, 1 deletionDocumentation/devicetree/bindings/soc/qcom/qcom,glink.txt
- Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.txt 2 additions, 2 deletionsDocumentation/devicetree/bindings/soc/qcom/qcom,smp2p.txt
- Documentation/fb/fbcon.txt 8 additions, 0 deletionsDocumentation/fb/fbcon.txt
- Documentation/networking/index.rst 13 additions, 13 deletionsDocumentation/networking/index.rst
- Documentation/networking/rxrpc.txt 0 additions, 45 deletionsDocumentation/networking/rxrpc.txt
- Documentation/networking/snmp_counter.rst 126 additions, 4 deletionsDocumentation/networking/snmp_counter.rst
- Documentation/networking/timestamping.txt 2 additions, 2 deletionsDocumentation/networking/timestamping.txt
- MAINTAINERS 3 additions, 4 deletionsMAINTAINERS
- Makefile 5 additions, 5 deletionsMakefile
- arch/arm64/include/asm/cache.h 0 additions, 2 deletionsarch/arm64/include/asm/cache.h
- arch/arm64/include/asm/mmu.h 4 additions, 1 deletionarch/arm64/include/asm/mmu.h
Please register or sign in to comment