mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-09-06 21:03:21 +09:00
Merge branch 'master' of git://www.denx.de/git/u-boot-arm
Conflicts: include/asm-arm/arch-imx/imx-regs.h Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
commit
2f6e76d23c