Skip to content
Commit 4db2fa7f authored by Wolfgang Denk's avatar Wolfgang Denk
Browse files

Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx 



Conflicts:
	drivers/usb/host/ehci-pci.c

Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parents 75df0d59 7d3053fb
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