Conflicts: arch/x86/mach-default/setup.c Semantic conflict resolution: arch/x86/kernel/setup.c Signed-off-by: Ingo Molnar <mingo@elte.hu> |
||
---|---|---|
.. | ||
xenbus | ||
xenfs | ||
Kconfig | ||
Makefile | ||
balloon.c | ||
cpu_hotplug.c | ||
events.c | ||
features.c | ||
grant-table.c | ||
manage.c | ||
xencomm.c |