Learn more about cloning repositories
You have read-only access
Merge git://www.denx.de/git/u-boot Conflicts: board/tqm5200/tqm5200.c
