Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/usb/r8152.c
drivers/net/xen-netback/netback.c
Both the r8152 and netback conflicts were simple overlapping
changes.
Signed-off-by:
David S. Miller <davem@davemloft.net>
No related branches found
No related tags found
Showing
- Documentation/device-mapper/cache.txt 5 additions, 6 deletionsDocumentation/device-mapper/cache.txt
- Documentation/device-mapper/thin-provisioning.txt 31 additions, 3 deletionsDocumentation/device-mapper/thin-provisioning.txt
- Documentation/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt 4 additions, 4 deletions...ion/devicetree/bindings/pinctrl/brcm,bcm11351-pinctrl.txt
- Documentation/networking/packet_mmap.txt 1 addition, 1 deletionDocumentation/networking/packet_mmap.txt
- Documentation/networking/timestamping.txt 32 additions, 20 deletionsDocumentation/networking/timestamping.txt
- MAINTAINERS 10 additions, 1 deletionMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arc/mm/cache_arc700.c 2 additions, 2 deletionsarch/arc/mm/cache_arc700.c
- arch/arm/Kconfig 3 additions, 0 deletionsarch/arm/Kconfig
- arch/arm/boot/compressed/.gitignore 1 addition, 0 deletionsarch/arm/boot/compressed/.gitignore
- arch/arm/boot/dts/bcm11351.dtsi 1 addition, 1 deletionarch/arm/boot/dts/bcm11351.dtsi
- arch/arm/boot/dts/omap3-gta04.dts 1 addition, 1 deletionarch/arm/boot/dts/omap3-gta04.dts
- arch/arm/boot/dts/omap3-igep0020.dts 1 addition, 1 deletionarch/arm/boot/dts/omap3-igep0020.dts
- arch/arm/boot/dts/omap3-igep0030.dts 1 addition, 1 deletionarch/arm/boot/dts/omap3-igep0030.dts
- arch/arm/boot/dts/sun4i-a10.dtsi 1 addition, 1 deletionarch/arm/boot/dts/sun4i-a10.dtsi
- arch/arm/boot/dts/sun5i-a10s.dtsi 1 addition, 1 deletionarch/arm/boot/dts/sun5i-a10s.dtsi
- arch/arm/boot/dts/sun5i-a13.dtsi 1 addition, 1 deletionarch/arm/boot/dts/sun5i-a13.dtsi
- arch/arm/boot/dts/sun7i-a20.dtsi 6 additions, 6 deletionsarch/arm/boot/dts/sun7i-a20.dtsi
- arch/arm/configs/tegra_defconfig 3 additions, 0 deletionsarch/arm/configs/tegra_defconfig
- arch/arm/include/asm/memory.h 3 additions, 6 deletionsarch/arm/include/asm/memory.h
Please register or sign in to comment