Ingo Molnar 365d46dc9b Merge branch 'linus' into x86/xen ...

Conflicts:
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/process_64.c
	arch/x86/xen/enlighten.c

2008-10-12 12:37:32 +02:00

..

events.h

x86: consolidate header guards

2008-07-22 21:31:34 +02:00

grant_table.h

x86: consolidate header guards

2008-07-22 21:31:34 +02:00

hypercall.h

x86: consolidate header guards

2008-07-22 21:31:34 +02:00

hypervisor.h

Merge branch 'linus' into x86/xen

2008-10-12 12:37:32 +02:00

interface_32.h

x86: consolidate header guards

2008-07-22 21:31:34 +02:00

interface_64.h

x86: consolidate header guards

2008-07-22 21:31:34 +02:00

interface.h

x86: consolidate header guards

2008-07-22 21:31:34 +02:00

page.h

Merge branch 'linus' into x86/header-guards

2008-07-26 15:30:40 +02:00