efa4d684d8
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 |
||
---|---|---|
.. | ||
boards/x86_generic | ||
boot | ||
configs | ||
include/asm | ||
lib | ||
mach-i386 | ||
Kconfig | ||
Makefile |