original_kernel/drivers/xen
Ingo Molnar fc6fc7f1b1 Merge branch 'linus' into x86/apic
Conflicts:
	arch/x86/mach-default/setup.c

Semantic conflict resolution:
	arch/x86/kernel/setup.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-02-22 20:05:19 +01:00
..
xenbus
xenfs
Kconfig
Makefile
balloon.c
cpu_hotplug.c
events.c xen: explicitly initialise the cpu field of irq_info 2009-02-09 12:18:22 +01:00
features.c
grant-table.c
manage.c Merge branch 'linus' into x86/apic 2009-02-22 20:05:19 +01:00
xencomm.c