forked from luck/tmp_suning_uos_patched
558f6ab910
Conflicts: arch/x86/include/asm/topology.h drivers/oprofile/buffer_sync.c (Both cases: changed in Linus' tree, removed in Ingo's). |
||
---|---|---|
.. | ||
boot | ||
configs | ||
include/asm | ||
kernel | ||
lib | ||
math-emu | ||
mm | ||
oprofile | ||
prom | ||
Kconfig | ||
Kconfig.debug | ||
Makefile |