This commit merges branches from samsung, imx and tegra meant to fix merge issues between u-boot/master and u-boot-arm/master, as well as a few manual merge fixes. |
||
---|---|---|
.. | ||
clock.c | ||
Makefile | ||
pinmux.c | ||
power.c | ||
soc.c | ||
system.c |
This commit merges branches from samsung, imx and tegra meant to fix merge issues between u-boot/master and u-boot-arm/master, as well as a few manual merge fixes. |
||
---|---|---|
.. | ||
clock.c | ||
Makefile | ||
pinmux.c | ||
power.c | ||
soc.c | ||
system.c |