Learn more about cloning repositories
You have read-only access
Merge git://git.denx.de/u-boot into x1 Conflicts: drivers/usb/usb_ohci.c