forked from luck/tmp_suning_uos_patched
f066a15533
Conflicts: arch/frv/include/asm/pgtable.h arch/x86/include/asm/required-features.h arch/x86/xen/mmu.c Merge reason: x86/xen was on a .29 base still, move it to a fresher branch and pick up Xen fixes as well, plus resolve conflicts Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
---|---|---|
.. | ||
xenbus | ||
xenfs | ||
balloon.c | ||
cpu_hotplug.c | ||
events.c | ||
evtchn.c | ||
features.c | ||
grant-table.c | ||
Kconfig | ||
Makefile | ||
manage.c | ||
sys-hypervisor.c | ||
xencomm.c |