Merge branch 'master' of git://git.denx.de/u-boot-net
Signed-off-by:
Tom Rini <trini@konsulko.com>
Conflicts:
drivers/net/zynq_gem.c
No related branches found
No related tags found
Showing
- arch/arm/dts/am4372.dtsi 1 addition, 0 deletionsarch/arm/dts/am4372.dtsi
- arch/arm/dts/dra7.dtsi 2 additions, 1 deletionarch/arm/dts/dra7.dtsi
- arch/arm/include/asm/arch-omap5/cpu.h 12 additions, 0 deletionsarch/arm/include/asm/arch-omap5/cpu.h
- configs/am437x_gp_evm_defconfig 1 addition, 0 deletionsconfigs/am437x_gp_evm_defconfig
- configs/am437x_sk_evm_defconfig 1 addition, 0 deletionsconfigs/am437x_sk_evm_defconfig
- configs/dra74_evm_defconfig 1 addition, 0 deletionsconfigs/dra74_evm_defconfig
- doc/device-tree-bindings/net/ti,dp83867.txt 25 additions, 0 deletionsdoc/device-tree-bindings/net/ti,dp83867.txt
- drivers/core/device.c 14 additions, 0 deletionsdrivers/core/device.c
- drivers/net/Makefile 1 addition, 1 deletiondrivers/net/Makefile
- drivers/net/cpsw-common.c 121 additions, 0 deletionsdrivers/net/cpsw-common.c
- drivers/net/cpsw.c 51 additions, 26 deletionsdrivers/net/cpsw.c
- drivers/net/phy/mv88e61xx.c 901 additions, 421 deletionsdrivers/net/phy/mv88e61xx.c
- drivers/net/phy/mv88e61xx.h 0 additions, 61 deletionsdrivers/net/phy/mv88e61xx.h
- drivers/net/phy/phy.c 3 additions, 0 deletionsdrivers/net/phy/phy.c
- drivers/net/phy/ti.c 72 additions, 16 deletionsdrivers/net/phy/ti.c
- drivers/net/zynq_gem.c 9 additions, 5 deletionsdrivers/net/zynq_gem.c
- include/configs/ti_omap5_common.h 1 addition, 0 deletionsinclude/configs/ti_omap5_common.h
- include/cpsw.h 2 additions, 0 deletionsinclude/cpsw.h
- include/dm/device.h 23 additions, 0 deletionsinclude/dm/device.h
- include/dt-bindings/net/ti-dp83867.h 35 additions, 0 deletionsinclude/dt-bindings/net/ti-dp83867.h
Loading
Please register or sign in to comment