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	xen: add xenfs to allow usermode <-> Xen interaction	2009-01-08 08:30:59 -08:00
xenfs	xen: unitialised return value in xenbus_write_transaction	2009-01-26 14:29:26 +01:00
Kconfig	xen: add xenfs to allow usermode <-> Xen interaction	2009-01-08 08:30:59 -08:00
Makefile	xen: add xenfs to allow usermode <-> Xen interaction	2009-01-08 08:30:59 -08:00
balloon.c	xen: make sysfs files behave as their names suggest	2009-01-29 13:20:36 +01:00
cpu_hotplug.c	x86, um: ... and asm-x86 move	2008-10-22 22:55:20 -07:00
events.c	xen: explicitly initialise the cpu field of irq_info	2009-02-09 12:18:22 +01:00
features.c	xen: clean up asm/xen/hypervisor.h	2008-12-16 21:50:31 +01:00
grant-table.c	xen: clean up asm/xen/hypervisor.h	2008-12-16 21:50:31 +01:00
manage.c	Merge branch 'linus' into x86/apic	2009-02-22 20:05:19 +01:00
xencomm.c	xen: portability clean up and some minor clean up for xencomm.c	2008-10-23 21:54:36 +02:00