fc6fc7f1b1
Conflicts: arch/x86/mach-default/setup.c Semantic conflict resolution: arch/x86/kernel/setup.c Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
---|---|---|
.. | ||
boot | ||
include/asm | ||
kernel | ||
lib | ||
math-emu | ||
mm | ||
oprofile | ||
defconfig | ||
Kconfig | ||
Kconfig.debug | ||
Makefile |