3753efa427
Conflicts: arch/arm/boards/phytec-phyflex-imx6/board.c |
||
---|---|---|
.. | ||
.gitignore | ||
Makefile | ||
Makefile.am33xx | ||
Makefile.imx | ||
Makefile.mvebu | ||
Makefile.socfpga | ||
Makefile.tegra |
3753efa427
Conflicts: arch/arm/boards/phytec-phyflex-imx6/board.c |
||
---|---|---|
.. | ||
.gitignore | ||
Makefile | ||
Makefile.am33xx | ||
Makefile.imx | ||
Makefile.mvebu | ||
Makefile.socfpga | ||
Makefile.tegra |