Conflicts: arch/arm/boards/chumby_falconwing/falconwing.c arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c arch/x86/mach-x86.dox scripts/setupmbr/setupmbr.c |
||
---|---|---|
.. | ||
.gitignore | ||
arch.h | ||
Makefile | ||
setupmbr.c |
Conflicts: arch/arm/boards/chumby_falconwing/falconwing.c arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c arch/x86/mach-x86.dox scripts/setupmbr/setupmbr.c |
||
---|---|---|
.. | ||
.gitignore | ||
arch.h | ||
Makefile | ||
setupmbr.c |