Skip to content
Commit 50bd0057 authored by Markus Klotzbuecher's avatar Markus Klotzbuecher
Browse files

Merge git://git.denx.de/u-boot into x1 

Conflicts:

	drivers/usb/usb_ohci.c
parents 9dbc3667 f82642e3
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment