Rusty Russell 2ca1a61583 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	arch/x86/kernel/io_apic.c

2008-12-31 23:05:57 +10:30

..

xenbus

xen: clean up domain mode predicates

2008-08-20 12:40:07 +02:00

balloon.c

xen: clean up asm/xen/hypervisor.h

2008-12-16 21:50:31 +01:00

cpu_hotplug.c

x86, um: ... and asm-x86 move

2008-10-22 22:55:20 -07:00

events.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2008-12-31 23:05:57 +10:30

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

Kconfig

xen: add balloon driver

2008-04-24 23:57:33 +02:00

Makefile

Xen: fix cpu_hotplug build when !CONFIG_SMP

2008-09-05 17:44:07 +02:00

manage.c

xen: don't reload cr3 on suspend

2008-10-23 21:54:35 +02:00

xencomm.c

xen: portability clean up and some minor clean up for xencomm.c

2008-10-23 21:54:36 +02:00