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 | ||
| balloon.c | ||
| cpu_hotplug.c | ||
| events.c | ||
| features.c | ||
| grant-table.c | ||
| Kconfig | ||
| Makefile | ||
| manage.c | ||
| xencomm.c | ||