Conflicts: arch/ppc/lib/ppclinux.c commands/bootm.c include/boot.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> |
||
---|---|---|
.. | ||
env | ||
config.h | ||
lowlevel_init.S | ||
Makefile | ||
pca100.c | ||
pca100.dox |
Conflicts: arch/ppc/lib/ppclinux.c commands/bootm.c include/boot.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> |
||
---|---|---|
.. | ||
env | ||
config.h | ||
lowlevel_init.S | ||
Makefile | ||
pca100.c | ||
pca100.dox |