Merge branch 'master' of git://git.denx.de/u-boot-usb
Conflicts:
include/configs/arndale.h
Signed-off-by:
Tom Rini <trini@ti.com>
No related branches found
No related tags found
Showing
- drivers/usb/eth/Makefile 1 addition, 0 deletionsdrivers/usb/eth/Makefile
- drivers/usb/eth/asix88179.c 700 additions, 0 deletionsdrivers/usb/eth/asix88179.c
- drivers/usb/eth/usb_ether.c 7 additions, 0 deletionsdrivers/usb/eth/usb_ether.c
- include/configs/arndale.h 5 additions, 0 deletionsinclude/configs/arndale.h
- include/usb_ether.h 6 additions, 0 deletionsinclude/usb_ether.h
Loading
Please register or sign in to comment